From 1376fd58e65d453480ff87a4dcce3531060f5c8d Mon Sep 17 00:00:00 2001 From: "gs86.lee" Date: Wed, 15 Jul 2015 22:15:08 +0900 Subject: [PATCH] Fix dead timer callback func. Change-Id: I3ac8011a30428e793cfbca5237c0cd3cf56c0f54 --- src/mobile/home_mgr.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/mobile/home_mgr.c b/src/mobile/home_mgr.c index 454d208..bfa1d9c 100644 --- a/src/mobile/home_mgr.c +++ b/src/mobile/home_mgr.c @@ -191,12 +191,6 @@ static int _change_selected_package_name(status_active_key_e key, void *data) char *appid = NULL; int seq = status_active_get()->starter_sequence; - /** - * @todo - * Sequence is not changed. it should be managed by WHO? - */ - seq = 1; - if (seq < 1) { _E("Sequence is not ready yet, do nothing"); return 1; @@ -305,9 +299,13 @@ static Eina_Bool _dead_timer_cb(void *data) if (s_home_mgr.dead_count >= DEAD_TIMER_COUNT_MAX) { _D("Change homescreen package to default"); - if (vconf_set_str(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME, MENU_SCREEN_PKG_NAME) != 0) { - _E("cannot set the vconf key as %s", MENU_SCREEN_PKG_NAME); - return ECORE_CALLBACK_RENEW; + /* set fallback status */ + if (vconf_set_int(VCONFKEY_STARTER_IS_FALLBACK, 1) < 0) { + _E("Failed to set vconfkey : %s", VCONFKEY_STARTER_IS_FALLBACK); + } + + if (vconf_set_str(VCONFKEY_STARTER_FALLBACK_PKG, appid) < 0) { + _E("Failed to set vconfkey : %s", VCONFKEY_STARTER_FALLBACK_PKG); } strncpy(title, _("IDS_COM_POP_WARNING"), sizeof(title)); @@ -326,13 +324,9 @@ static Eina_Bool _dead_timer_cb(void *data) } } - /* set fallback status */ - if (vconf_set_int(VCONFKEY_STARTER_IS_FALLBACK, 1) < 0) { - _E("Failed to set vconfkey : %s", VCONFKEY_STARTER_IS_FALLBACK); - } - - if (vconf_set_str(VCONFKEY_STARTER_FALLBACK_PKG, appid) < 0) { - _E("Failed to set vconfkey : %s", VCONFKEY_STARTER_FALLBACK_PKG); + if (vconf_set_str(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME, MENU_SCREEN_PKG_NAME) != 0) { + _E("cannot set the vconf key as %s", MENU_SCREEN_PKG_NAME); + return ECORE_CALLBACK_RENEW; } } -- 2.7.4