From ddecba5b5daed6066f900df9b8750f15f1a78298 Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Fri, 4 Apr 2014 16:02:01 -0700 Subject: [PATCH] input: Fix input.conf IdleTimeout handling IdleTimeout is an optional config item in input.conf. Don't complain if it is not defined. Instead, do the opposite and show its value in debug logs only when it is defined. --- profiles/input/manager.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/profiles/input/manager.c b/profiles/input/manager.c index 6ef83f417..23e739a58 100644 --- a/profiles/input/manager.c +++ b/profiles/input/manager.c @@ -99,13 +99,12 @@ static int input_init(void) int idle_timeout; idle_timeout = g_key_file_get_integer(config, "General", - "IdleTimeout", &err); - if (err) { - DBG("input.conf: %s", err->message); - g_error_free(err); - } - - input_set_idle_timeout(idle_timeout * 60); + "IdleTimeout", &err); + if (!err) { + DBG("input.conf: IdleTimeout=%d", idle_timeout); + input_set_idle_timeout(idle_timeout * 60); + } else + g_clear_error(&err); } btd_profile_register(&input_profile); -- 2.47.3