fix to enter security-ug

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 9da77ad..30f7393 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -1,4 +1,4 @@
-Name:       settings
+Name:       org.tizen.setting
 Summary:    Setting application
 Version:    0.1.87
 Release:    99
@@ -411,7 +411,7 @@ mkdir -p /opt/ug/bin/
 ln -sf /usr/bin/ug-client /opt/ug/bin/setting-font-efl
 # ln -sf /usr/bin/ug-client /opt/ug/bin/setting-accessibility-efl
 
-%files -n settings
+%files -n org.tizen.setting
 #%manifest settings.manifest
 %defattr(-,root,root,-)
 #%attr(-,inhouse,inhouse) %dir /opt/data/setting

diff --git a/setting-security/include/setting-security.h b/setting-security/include/setting-security.h
index f74977d..ebe6027 100755 (executable)
--- a/setting-security/include/setting-security.h
+++ b/setting-security/include/setting-security.h
@@ -113,7 +113,6 @@ extern setting_view setting_view_security_sim_settings;
 
 SettingSecurityUG *g_ad;       /* for tapi callback */
 
-char *get_find_my_mobile_on_off_str(void *priv);
 void setting_security_result_password_ug_cb(ui_gadget_h ug,
                                            service_h service, void *priv);
 void setting_security_sim_get_facility_cb(TapiHandle *handle, int result, void *data, void *user_data);

diff --git a/setting-security/src/setting-security-sim-settings.c b/setting-security/src/setting-security-sim-settings.c
index 43a296c..e849907 100755 (executable)
--- a/setting-security/src/setting-security-sim-settings.c
+++ b/setting-security/src/setting-security-sim-settings.c
@@ -116,26 +116,9 @@ static int setting_security_sim_settings_create(void *cb)
                                                                SWALLOW_Type_INVALID,
                                                                NULL, NULL,
                                                                0,"IDS_ST_BODY_CHANGE_PIN2", NULL, NULL);
-       if(!ad->pin2_status)
-               setting_disable_genlist_item(ad->data_change_pin2->item);
-#if SUPPORT_FDN
-       /* j. FDN */
-       //if TAPI is responsed in time, ad->sim_status will have invalid value,
-       //or else ad->data_fdn will be updated by setting_security_sim_get_facility_cb
-       ad->data_fdn = setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon),
-                                                       setting_security_sim_settings_mouse_up_Gendial_list_cb, ad,
-                                                       SWALLOW_Type_1TOGGLE,
-                                                       NULL, NULL,
-                                                       ad->pin2_status, Keystr_FDN, NULL, setting_security_sim_settings_chk_btn_cb);
-       if(ad->data_fdn)
-               ad->data_fdn->userdata = ad;
-#endif
 
        setting_view_security_sim_settings.is_create = 1;
 
-       vconf_notify_key_changed(VCONFKEY_SETAPPL_SIM_LOCK_ATTEMPTS_LEFT_INT,
-                                setting_security_main_vconf_change_cb, ad);
-
        return SETTING_RETURN_SUCCESS;
 
 }
@@ -150,9 +133,6 @@ static int setting_security_sim_settings_destroy(void *cb)
 
        elm_naviframe_item_pop(ad->navi_bar);
 
-       vconf_ignore_key_changed(VCONFKEY_SETAPPL_SIM_LOCK_ATTEMPTS_LEFT_INT,
-                                setting_security_main_vconf_change_cb);
-
        setting_view_security_sim_settings.is_create = 0;
 
        return SETTING_RETURN_SUCCESS;
@@ -287,6 +267,7 @@ static void get_pin_lock_info_cb(TapiHandle *handle, int result, void *data, voi
 static void get_sim_lock_info_cb(TapiHandle *handle, int result, void *data, void *user_data)
 {
        SETTING_TRACE_BEGIN;
+       ret_if(data == NULL || user_data == NULL);
 
        TelSimPinOperationResult_t sec_rt = result;
        TelSimLockInfo_t *lock = data;
@@ -337,6 +318,7 @@ void _draw_sim_onoff_status(void *data, Evas_Object *check)
 static void get_change_pin_info_cb(TapiHandle *handle, int result, void *data, void *user_data)
 {
        SETTING_TRACE_BEGIN;
+       ret_if(data == NULL || user_data == NULL);
 
        TelSimPinOperationResult_t sec_rt = result;
        TelSimLockInfo_t *lock = data;
@@ -487,16 +469,6 @@ setting_security_sim_settings_chk_btn_cb(void *data, Evas_Object *obj,
                _draw_pin_onoff_status(ad, obj);
 
        }
-#if SUPPORT_FDN
-       else if (!safeStrCmp(Keystr_FDN, list_item->keyStr)){
-               //Rollback state of toggle.
-               //it invokes async TAPIs to enable/disable, so don't change the status at first to avoid rollback
-               list_item->chk_status = !list_item->chk_status;
-               elm_check_state_set(obj, list_item->chk_status);
-               ad->chk_fdn = obj;
-               _draw_fdn_onoff_status(ad, obj);
-       }
-#endif
 }
 
 

diff --git a/setting-security/src/setting-security.c b/setting-security/src/setting-security.c
index 537f243..32e5a5e 100755 (executable)
--- a/setting-security/src/setting-security.c
+++ b/setting-security/src/setting-security.c
@@ -178,7 +178,7 @@ static void *setting_security_ug_on_create(ui_gadget_h ug,
        securityUG->evas = evas_object_evas_get(securityUG->win_main_layout);
 
        setting_retvm_if(securityUG->win_main_layout == NULL, NULL,
-                        "[Setting >> About] cannot get main window ");
+                        "[Setting >> Security] cannot get main window ");
 
        /* register view node table */
        setting_view_node_table_intialize();
@@ -210,9 +210,6 @@ static void *setting_security_ug_on_create(ui_gadget_h ug,
                if (TAPI_API_SUCCESS != tel_get_sim_facility(securityUG->handle, TAPI_SIM_LOCK_SC, setting_security_sim_get_facility_cb, securityUG)) {
                        SETTING_TRACE_ERROR("*** [ERR] tel_get_sim_facility(pin1). ***");
                }
-               if (TAPI_API_SUCCESS != tel_get_sim_facility(securityUG->handle, TAPI_SIM_LOCK_FD, setting_security_sim_get_facility_cb, securityUG)) {
-                       SETTING_TRACE_ERROR("*** [ERR] tel_get_sim_facility(pin2). ***");
-               }
        }
 
        setting_view_node_set_cur_view(&setting_view_security_main);