From aa7b5a65bed03d62285102cefd11d67804d492cf Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Mon, 26 May 2014 00:02:40 +0200 Subject: [PATCH] gui: Remove --timeout. para_gui should work well regardless of the scheduler timeout setting. This commit removes the timeout options and changes gui.c to use a fixed timeout of one second. --- gui.c | 7 +------ m4/gengetopt/gui.m4 | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/gui.c b/gui.c index 8e83cc53..6a601f81 100644 --- a/gui.c +++ b/gui.c @@ -1431,12 +1431,7 @@ static int setup_tasks_and_schedule(void) struct status_task status_task = {.fd = -1}; struct input_task input_task = {.task = NULL}; struct signal_task *signal_task; - struct sched sched = { - .default_timeout = { - .tv_sec = conf.timeout_arg / 1000, - .tv_usec = (conf.timeout_arg % 1000) * 1000, - }, - }; + struct sched sched = {.default_timeout = {.tv_sec = 1}}; exec_task.task = task_register(&(struct task_info) { .name = "exec", diff --git a/m4/gengetopt/gui.m4 b/m4/gengetopt/gui.m4 index a6b718ee..373416ce 100644 --- a/m4/gengetopt/gui.m4 +++ b/m4/gengetopt/gui.m4 @@ -16,12 +16,6 @@ include(config_file.m4) include(loglevel.m4) -option "timeout" t -#~~~~~~~~~~~~~~~~~ -"set timeout" -int typestr = "milliseconds" -default = "30" -optional option "theme" T #~~~~~~~~~~~~~~~ -- 2.30.2