remove security related code in reset
authorHyejin Kim <hyejin0906.kim@samsung.com>
Wed, 29 Aug 2012 01:33:23 +0000 (10:33 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Wed, 29 Aug 2012 01:33:23 +0000 (10:33 +0900)
setting-reset/src/setting-reset-main.c
setting-reset/src/setting-reset-settings.c

index c85280f..9da579b 100755 (executable)
@@ -439,6 +439,7 @@ static void __ask_create_factory_reset_resp_cb(void *data, Evas_Object *obj,
 
        if (POPUP_RESPONSE_OK == response_type) {
                SETTING_TRACE("OK");
+#if SUPPORT_SECURITY
                vconf_get_int(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, &screen_lock_type);
                if(screen_lock_type == SETTING_SCREEN_LOCK_TYPE_PASSWORD
                        || screen_lock_type == SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD)
@@ -447,6 +448,7 @@ static void __ask_create_factory_reset_resp_cb(void *data, Evas_Object *obj,
                }
                else
                {
+#endif
                        /* do factory reset here. */
                        int pid = -1;
                        pid = fork();
@@ -458,7 +460,9 @@ static void __ask_create_factory_reset_resp_cb(void *data, Evas_Object *obj,
                                execve("/usr/bin/factory-reset", argv, environ);
                                exit(0);
                        }
+#if SUPPORT_SECURITY
                }
+#endif
        } else if (POPUP_RESPONSE_CANCEL == response_type) {
                SETTING_TRACE("NO");
                // do nothing
index 52a97e7..53d0813 100755 (executable)
@@ -702,6 +702,7 @@ setting_reset_settings_click_softkey_reset_cb(void *data, Evas_Object *obj,
        if (!setting_done_list_is_some_item_selected(&(ad->list_data))) {
                setting_create_simple_popup(NULL, ad->win_get, NULL, "No item selected");
        } else {
+#if SUPPORT_SECURITY
                vconf_get_int(VCONFKEY_SETAPPL_SCREEN_LOCK_TYPE_INT, &screen_lock_type);
                if(screen_lock_type == SETTING_SCREEN_LOCK_TYPE_PASSWORD
                        || screen_lock_type == SETTING_SCREEN_LOCK_TYPE_SIMPLE_PASSWORD)
@@ -710,7 +711,10 @@ setting_reset_settings_click_softkey_reset_cb(void *data, Evas_Object *obj,
                }
                else
                {
+#endif
                        setting_reset_settings_check_state(&(ad->list_data));
+#if SUPPORT_SECURITY
                }
+#endif
        }
 }