refine vconf callbacks 41/261441/2
authorJeonghoon Park <jh1979.park@samsung.com>
Mon, 19 Jul 2021 05:12:05 +0000 (14:12 +0900)
committerAmritanshu Pandia <a.pandia1@samsung.com>
Wed, 21 Jul 2021 07:24:21 +0000 (07:24 +0000)
Change-Id: I68158309e3dd0f179cec6c15f3788ba2c499176d

src/status.c

index 5873254..b241444 100644 (file)
@@ -68,7 +68,197 @@ static struct status_passive_s s_status_passive = {
        .setappl_3rd_lock_pkg_name_str = NULL,
 };
 
+static inline void _call_callback(status_active_key_e key)
+{
+       const Eina_List *l = NULL;
+       cb_info_s *info = NULL;
+
+       EINA_LIST_FOREACH(s_status_active.list[key], l, info) {
+               continue_if(!info->func);
+               if (0 == info->func(key, info->data)) break;
+       }
+}
+
+static inline void _set_str_with_default(keynode_t* node, const char *def, char *target)
+{
+       const char *key_str = vconf_keynode_get_str(node);
+       char *str = NULL;
+
+       if (key_str)
+               str = strdup(key_str);
+       else
+               str = strdup(def);
+
+       if (!str)
+               _E("failed to strdup, keep old one");
+
+       free(target);
+       target = str;
+}
+
+static void _pm_state_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_active.pm_state = vconf_keynode_get_int(node);
+       _call_callback(STATUS_ACTIVE_KEY_PM_STATE);
+}
+
+static void _setappl_select_pkg_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+
+       _set_str_with_default(node, HOMESCREEN_PKG_NAME,
+               s_status_active.setappl_selected_package_name);
+       if (!s_status_active.setappl_selected_package_name)
+               _E("Package name is NULL");
+
+       _call_callback(STATUS_ACTIVE_KEY_SETAPPL_SELECTED_PACKAGE_NAME);
+}
+
+static void _setappl_screen_lock_type_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_active.setappl_screen_lock_type_int = vconf_keynode_get_int(node);
+       _call_callback(STATUS_ACTIVE_KEY_SETAPPL_SCREEN_LOCK_TYPE_INT);
+}
+
+static void _starter_seq_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_active.starter_sequence = vconf_keynode_get_int(node);
+       _call_callback(STATUS_ACTIVE_KEY_STARTER_SEQUENCE);
+}
+
+static void _sysman_power_off_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_active.sysman_power_off_status = vconf_keynode_get_int(node);
+       _call_callback(STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS);
+}
+
+static void _langset_cb(keynode_t* node, void *data)
+{
+       const char *lang = NULL;
+       ret_if(!node);
+
+       lang = vconf_keynode_get_str(node);
+       free(s_status_active.langset);
+       s_status_active.langset = NULL;
+
+       if (lang)
+               s_status_active.langset = strdup(lang);
+
+       _call_callback(STATUS_ACTIVE_KEY_LANGSET);
+}
+
+static void _boot_ani_fini_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_active.boot_animation_finished = vconf_keynode_get_int(node);
+       _call_callback(STATUS_ACTIVE_KEY_BOOT_ANIMATION_FINISHED);
+}
+
+//passive
+#ifdef TIZEN_PROFILE_WEARABLE
+static void _wms_wakeup_by_gesture_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.wms_wakeup_by_gesture_setting = vconf_keynode_get_int(node);
+}
+
+static void _wms_clocks_set_idle_cb(keynode_t* node, void *data)
+{
+       const char *clocks = NULL;
+       ret_if(!node);
+
+       clocks = vconf_keynode_get_str(node);
+       if (clocks) {
+               free(s_status_passive.wms_clocks_set_idle);
+               s_status_passive.wms_clocks_set_idle = strdup(clocks);
+       }
+}
+
+static void _setappl_ambient_mode_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.setappl_ambient_mode_bool = vconf_keynode_get_int(node);
+}
+
+static void _setappl_double_press_home_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.setappl_double_press_home_key = vconf_keynode_get_int(node);
+}
+
+static void _home_watchface_visiablity_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.homescreen_watch_face_visibility = vconf_keynode_get_bool(node);
+}
+#endif // TIZEN_PROFILE_WEARABLE
+
+static void _pm_key_ignore_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.pm_key_ignore = vconf_keynode_get_int(node);
+}
+
+static void _call_state_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.call_state = vconf_keynode_get_int(node);
+}
+
+static void _idle_lock_state_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.idle_lock_state = vconf_keynode_get_int(node);
+}
+
+static void _setappl_pwd_attempts_left_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.setappl_password_attempts_left_int = vconf_keynode_get_int(node);
+}
+
+static void _remote_lock_islocked_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.remote_lock_islocked = vconf_keynode_get_bool(node);
+}
+
+static void _setappl_psmode_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.setappl_psmode = vconf_keynode_get_int(node);
+}
+
+static void _starter_reserved_apps_status_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.starter_reserved_apps_status = vconf_keynode_get_int(node);
+}
+
+static void _starter_quick_launch_enable_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.starter_quick_launch_enable = vconf_keynode_get_bool(node);
+}
 
+static void _setappl_3rd_lock_pkg_name_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       _set_str_with_default(node, STATUS_DEFAULT_LOCK_PKG_NAME,
+               s_status_passive.setappl_3rd_lock_pkg_name_str);
+       if (!s_status_passive.setappl_3rd_lock_pkg_name_str)
+               _E("Package name is NULL");
+}
+
+static void _setappl_sound_lock_cb(keynode_t* node, void *data)
+{
+       ret_if(!node);
+       s_status_passive.setappl_sound_lock_bool = vconf_keynode_get_bool(node);
+}
 
 status_active_h status_active_get(void)
 {
@@ -128,169 +318,19 @@ int status_active_unregister_cb(status_active_key_e key, status_active_cb func)
        return 0;
 }
 
-
-
-static void _status_active_change_cb(keynode_t* node, void *data)
-{
-       const char *key_name = NULL;
-       const Eina_List *l = NULL;
-       cb_info_s *info = NULL;
-
-       ret_if(!node);
-
-       key_name = vconf_keynode_get_name(node);
-       ret_if(!key_name);
-
-       if (!strcmp(key_name, VCONFKEY_PM_STATE)) {
-               s_status_active.pm_state = vconf_keynode_get_int(node);
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_PM_STATE], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_PM_STATE, info->data)) break;
-               }
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME)) {
-               const char *tmp = vconf_keynode_get_str(node);
-               char *a_tmp;
-
-               if (tmp) {
-                       a_tmp = strdup(tmp);
-               } else {
-                       a_tmp = strdup(HOMESCREEN_PKG_NAME);
-               }
-
-               if (a_tmp) {
-                       free(s_status_active.setappl_selected_package_name);
-                       s_status_active.setappl_selected_package_name = a_tmp;
-               } else {
-                       if (!s_status_active.setappl_selected_package_name) {
-                               _E("Package name is NULL, strdup failed");
-                       } else {
-                               _E("Keep old package. because of strdup\n");
-                       }
-               }
-
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_SETAPPL_SELECTED_PACKAGE_NAME], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_SETAPPL_SELECTED_PACKAGE_NAME, info->data)) break;
-               }
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT)) {
-               s_status_active.setappl_screen_lock_type_int = vconf_keynode_get_int(node);
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_SETAPPL_SCREEN_LOCK_TYPE_INT], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_SETAPPL_SCREEN_LOCK_TYPE_INT, info->data)) break;
-               }
-       } else if (!strcmp(key_name, VCONFKEY_STARTER_SEQUENCE)) {
-               s_status_active.starter_sequence = vconf_keynode_get_int(node);
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_STARTER_SEQUENCE], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_STARTER_SEQUENCE, info->data)) break;
-               }
-       } else if (!strcmp(key_name, VCONFKEY_SYSMAN_POWER_OFF_STATUS)) {
-               s_status_active.sysman_power_off_status = vconf_keynode_get_int(node);
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_SYSMAN_POWER_OFF_STATUS, info->data)) break;
-               }
-       } else if (!strcmp(key_name, VCONFKEY_LANGSET)) {
-               const char *tmp = vconf_keynode_get_str(node);
-               free(s_status_active.langset);
-               if (tmp) s_status_active.langset = strdup(tmp);
-               else s_status_active.langset = NULL;
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_LANGSET], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_LANGSET, info->data)) break;
-               }
-       } else if (!strcmp(key_name, VCONFKEY_BOOT_ANIMATION_FINISHED)) {
-               s_status_active.boot_animation_finished = vconf_keynode_get_int(node);
-               EINA_LIST_FOREACH(s_status_active.list[STATUS_ACTIVE_KEY_BOOT_ANIMATION_FINISHED], l, info) {
-                       continue_if(!info->func);
-                       if (0 == info->func(STATUS_ACTIVE_KEY_BOOT_ANIMATION_FINISHED, info->data)) break;
-               }
-       }
-}
-
-
-
-static void _status_passive_change_cb(keynode_t* node, void *data)
-{
-       const char *key_name = NULL;
-
-       ret_if(!node);
-
-       key_name = vconf_keynode_get_name(node);
-       ret_if(!key_name);
-
-#ifdef TIZEN_PROFILE_WEARABLE
-       if (!strcmp(key_name, VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING)) {
-               s_status_passive.wms_wakeup_by_gesture_setting = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_WMS_CLOCKS_SET_IDLE)) {
-               const char *tmp = vconf_keynode_get_str(node);
-
-               if (tmp) {
-                       free(s_status_passive.wms_clocks_set_idle);
-                       s_status_passive.wms_clocks_set_idle = strdup(tmp);
-               }
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL)) {
-               s_status_passive.setappl_ambient_mode_bool = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY)) {
-               s_status_passive.setappl_double_press_home_key = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY)) {
-               s_status_passive.homescreen_watch_face_visibility = vconf_keynode_get_bool(node);
-       } else
-#endif
-       if (!strcmp(key_name, VCONFKEY_PM_KEY_IGNORE)) {
-               s_status_passive.pm_key_ignore = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_CALL_STATE)) {
-               s_status_passive.call_state = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_IDLE_LOCK_STATE)) {
-               s_status_passive.idle_lock_state = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT)) {
-               s_status_passive.setappl_password_attempts_left_int = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_REMOTE_LOCK_ISLOCKED)) {
-               s_status_passive.remote_lock_islocked = vconf_keynode_get_bool(node);
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_PSMODE)) {
-               s_status_passive.setappl_psmode = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_STARTER_RESERVED_APPS_STATUS)) {
-               s_status_passive.starter_reserved_apps_status = vconf_keynode_get_int(node);
-       } else if (!strcmp(key_name, VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE)) {
-               s_status_passive.starter_quick_launch_enable = vconf_keynode_get_bool(node);
-       } else if (!strcmp(key_name, VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR)) {
-               const char *tmp = vconf_keynode_get_str(node);
-               char *a_tmp;
-
-               if (tmp) {
-                       a_tmp = strdup(tmp);
-               } else {
-                       a_tmp = strdup(STATUS_DEFAULT_LOCK_PKG_NAME);
-               }
-
-               if (a_tmp) {
-                       free(s_status_passive.setappl_3rd_lock_pkg_name_str);
-                       s_status_passive.setappl_3rd_lock_pkg_name_str = a_tmp;
-               } else {
-                       if (!s_status_passive.setappl_3rd_lock_pkg_name_str) {
-                               _E("Package name is NULL, strdup failed");
-                       } else {
-                               _E("Keep old package. because of strdup\n");
-                       }
-               }
-       }
-}
-
-
-
 int status_register(void)
 {
        _W("Register every events for Starter");
 
        /* Active events */
-       if (vconf_notify_key_changed(VCONFKEY_PM_STATE, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_PM_STATE, _pm_state_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_PM_STATE);
        } else if (vconf_get_int(VCONFKEY_PM_STATE, &s_status_active.pm_state) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_PM_STATE);
                s_status_active.pm_state = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME, _setappl_select_pkg_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME);
        }
        if (!(s_status_active.setappl_selected_package_name = vconf_get_str(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME))) {
@@ -301,34 +341,34 @@ int status_register(void)
                }
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, _setappl_screen_lock_type_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT);
        } else if (vconf_get_int(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, &s_status_active.setappl_screen_lock_type_int) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT);
                s_status_active.setappl_screen_lock_type_int = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_STARTER_SEQUENCE, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_STARTER_SEQUENCE, _starter_seq_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_STARTER_SEQUENCE);
        } else if (vconf_get_int(VCONFKEY_STARTER_SEQUENCE, &s_status_active.starter_sequence) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_STARTER_SEQUENCE);
                s_status_active.starter_sequence = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, _sysman_power_off_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SYSMAN_POWER_OFF_STATUS);
        } else if (vconf_get_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, &s_status_active.sysman_power_off_status) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SYSMAN_POWER_OFF_STATUS);
                s_status_active.sysman_power_off_status  = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_LANGSET, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_LANGSET, _langset_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_LANGSET);
        } else if (!(s_status_active.langset = vconf_get_str(VCONFKEY_LANGSET))) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_LANGSET);
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_BOOT_ANIMATION_FINISHED, _status_active_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_BOOT_ANIMATION_FINISHED, _boot_ani_fini_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_BOOT_ANIMATION_FINISHED);
        } else if (vconf_get_int(VCONFKEY_BOOT_ANIMATION_FINISHED, &s_status_active.boot_animation_finished) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_BOOT_ANIMATION_FINISHED);
@@ -337,14 +377,14 @@ int status_register(void)
 
        /* Passive events */
 #ifdef TIZEN_PROFILE_WEARABLE
-       if (vconf_notify_key_changed(VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING, _wms_wakeup_by_gesture_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING);
        } else if (vconf_get_int(VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING, &s_status_passive.wms_wakeup_by_gesture_setting) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING);
                s_status_passive.wms_wakeup_by_gesture_setting = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_WMS_CLOCKS_SET_IDLE, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_WMS_CLOCKS_SET_IDLE, _wms_clocks_set_idle_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_WMS_CLOCKS_SET_IDLE);
        }
        if (!(s_status_passive.wms_clocks_set_idle = vconf_get_str(VCONFKEY_WMS_CLOCKS_SET_IDLE))) {
@@ -355,21 +395,21 @@ int status_register(void)
                }
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL, _setappl_ambient_mode_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL);
        } else if (vconf_get_int(VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL, &s_status_passive.setappl_ambient_mode_bool) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL);
                s_status_passive.setappl_ambient_mode_bool = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, _home_watchface_visiablity_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY);
        } else if (vconf_get_bool(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, &s_status_passive.homescreen_watch_face_visibility) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY);
                s_status_passive.homescreen_watch_face_visibility = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, _setappl_double_press_home_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY);
        } else if (vconf_get_int(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, &s_status_passive.setappl_double_press_home_key) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY);
@@ -377,70 +417,70 @@ int status_register(void)
        }
 #endif
 
-       if (vconf_notify_key_changed(VCONFKEY_PM_KEY_IGNORE, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_PM_KEY_IGNORE, _pm_key_ignore_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_PM_KEY_IGNORE);
        } else if (vconf_get_int(VCONFKEY_PM_KEY_IGNORE, &s_status_passive.pm_key_ignore) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_PM_KEY_IGNORE);
                s_status_passive.pm_key_ignore = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_CALL_STATE, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_CALL_STATE, _call_state_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_CALL_STATE);
        } else if (vconf_get_int(VCONFKEY_CALL_STATE, &s_status_passive.call_state) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_CALL_STATE);
                s_status_passive.call_state = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_IDLE_LOCK_STATE, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_IDLE_LOCK_STATE, _idle_lock_state_cb, NULL) < 0) {
                _E("Failed to regsiter add the callback for %s", VCONFKEY_IDLE_LOCK_STATE);
        } else if (vconf_get_int(VCONFKEY_IDLE_LOCK_STATE, &s_status_passive.idle_lock_state) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_IDLE_LOCK_STATE);
                s_status_passive.idle_lock_state = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT, _setappl_pwd_attempts_left_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT);
        } else if (vconf_get_int(VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT, &s_status_passive.setappl_password_attempts_left_int) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT);
                s_status_passive.setappl_password_attempts_left_int = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_REMOTE_LOCK_ISLOCKED, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_REMOTE_LOCK_ISLOCKED, _remote_lock_islocked_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_REMOTE_LOCK_ISLOCKED);
        } else if (vconf_get_bool(VCONFKEY_REMOTE_LOCK_ISLOCKED, &s_status_passive.remote_lock_islocked) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_REMOTE_LOCK_ISLOCKED);
                s_status_passive.remote_lock_islocked = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, _setappl_psmode_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_PSMODE);
        } else if (vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &s_status_passive.setappl_psmode) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SETAPPL_PSMODE);
                s_status_passive.setappl_psmode = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_STARTER_RESERVED_APPS_STATUS, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_STARTER_RESERVED_APPS_STATUS, _starter_reserved_apps_status_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_STARTER_RESERVED_APPS_STATUS);
        } else if (vconf_get_int(VCONFKEY_STARTER_RESERVED_APPS_STATUS, &s_status_passive.starter_reserved_apps_status) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_STARTER_RESERVED_APPS_STATUS);
                s_status_passive.starter_reserved_apps_status = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE, _starter_quick_launch_enable_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE);
        } else if (vconf_get_bool(VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE, &s_status_passive.starter_quick_launch_enable) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE);
                s_status_passive.starter_quick_launch_enable = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, _setappl_sound_lock_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_SOUND_LOCK_BOOL);
        } else if (vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, &s_status_passive.setappl_sound_lock_bool) < 0) {
                _E("Failed to get vconfkey[%s]", VCONFKEY_SETAPPL_SOUND_LOCK_BOOL);
                s_status_passive.setappl_sound_lock_bool = -1;
        }
 
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, _status_passive_change_cb, NULL) < 0) {
+       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, _setappl_3rd_lock_pkg_name_cb, NULL) < 0) {
                _E("Failed to register add the callback for %s", VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR);
        }
        if (!(s_status_passive.setappl_3rd_lock_pkg_name_str = vconf_get_str(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR))) {
@@ -459,99 +499,102 @@ int status_register(void)
 void status_unregister(void)
 {
        /* Active events */
-       if (vconf_ignore_key_changed(VCONFKEY_PM_STATE, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_PM_STATE, _pm_state_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_PM_STATE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME, _setappl_select_pkg_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_SELECTED_PACKAGE_NAME);
        }
        free(s_status_active.setappl_selected_package_name);
+       s_status_active.setappl_selected_package_name = NULL;
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, _setappl_screen_lock_type_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_STARTER_SEQUENCE, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_STARTER_SEQUENCE, _starter_seq_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_STARTER_SEQUENCE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, _sysman_power_off_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SYSMAN_POWER_OFF_STATUS);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_LANGSET, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_LANGSET, _langset_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_LANGSET);
        }
        free(s_status_active.langset);
+       s_status_active.langset = NULL;
 
-       if (vconf_ignore_key_changed(VCONFKEY_BOOT_ANIMATION_FINISHED, _status_active_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_BOOT_ANIMATION_FINISHED, _boot_ani_fini_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_BOOT_ANIMATION_FINISHED);
        }
 
        /* Passive events */
 #ifdef TIZEN_PROFILE_WEARABLE
-       if (vconf_ignore_key_changed(VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING, _wms_wakeup_by_gesture_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_WMS_WAKEUP_BY_GESTURE_SETTING);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_WMS_CLOCKS_SET_IDLE, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_WMS_CLOCKS_SET_IDLE, _wms_clocks_set_idle_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_WMS_CLOCKS_SET_IDLE);
        }
        free(s_status_passive.wms_clocks_set_idle);
+       s_status_passive.wms_clocks_set_idle = NULL;
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL, _setappl_ambient_mode_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_AMBIENT_MODE_BOOL);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, _home_watchface_visiablity_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, _setappl_double_press_home_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY);
        }
 #endif
 
-       if (vconf_ignore_key_changed(VCONFKEY_PM_KEY_IGNORE, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_PM_KEY_IGNORE, _pm_key_ignore_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_PM_KEY_IGNORE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_CALL_STATE, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_CALL_STATE, _call_state_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_CALL_STATE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_IDLE_LOCK_STATE, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_IDLE_LOCK_STATE, _idle_lock_state_cb) < 0) {
                _E("Faield to unregister the callback for %s", VCONFKEY_IDLE_LOCK_STATE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT, _setappl_pwd_attempts_left_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_PASSWORD_ATTEMPTS_LEFT_INT);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_REMOTE_LOCK_ISLOCKED, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_REMOTE_LOCK_ISLOCKED, _remote_lock_islocked_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_REMOTE_LOCK_ISLOCKED);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE, _setappl_psmode_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_PSMODE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_STARTER_RESERVED_APPS_STATUS, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_STARTER_RESERVED_APPS_STATUS, _starter_reserved_apps_status_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_STARTER_RESERVED_APPS_STATUS);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, _setappl_sound_lock_cb) < 0) {
                _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_SOUND_LOCK_BOOL);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_USE_PICK_UP, _status_passive_change_cb) < 0) {
-               _E("Failed to unregister the callback for %s", VCONFKEY_SETAPPL_USE_PICK_UP);
+       if (vconf_ignore_key_changed(VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE, _starter_quick_launch_enable_cb) < 0) {
+               _E("Failed to unregister the callback for %s", VCONFKEY_STARTER_QUICK_LAUNCH_ENABLE);
        }
 
-       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, _status_passive_change_cb) < 0) {
+       if (vconf_ignore_key_changed(VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR, _setappl_3rd_lock_pkg_name_cb) < 0) {
                _E("Failed to unregister ther callback for %s", VCONFKEY_SETAPPL_3RD_LOCK_PKG_NAME_STR);
        }
        free(s_status_passive.setappl_3rd_lock_pkg_name_str);
+       s_status_passive.setappl_3rd_lock_pkg_name_str = NULL;
 }
-