cahnge to OK button for privacy

diff --git a/setting-privacy/src/setting-privacy-service.c b/setting-privacy/src/setting-privacy-service.c
index 0994bc4..9f938bb 100755 (executable)
--- a/setting-privacy/src/setting-privacy-service.c
+++ b/setting-privacy/src/setting-privacy-service.c
@@ -52,8 +52,8 @@ static int _get_privacy_appinfo_by_pkgid(void* data)
 {
        SETTING_TRACE_BEGIN;
        SettingPrivacyUG *ad = (SettingPrivacyUG *)data;
-       
-       int ret = 0;    
+
+       int ret = 0;
        pkgmgr_pkginfo_h pkg_handle = NULL;
        char *pkg_name = NULL;
        char *icon_path = NULL;
@@ -78,7 +78,7 @@ static int _get_privacy_appinfo_by_pkgid(void* data)
                goto end;
        }
        SETTING_TRACE_DEBUG("pkg_name: %s", pkg_name);
-       
+
        //main appid
        ret = pkgmgrinfo_pkginfo_get_mainappid(handle, &main_appid);
        if (ret < 0)
@@ -140,7 +140,7 @@ static void _privacy_info_cb(const privacy_info_h* privacy_info, void* data)
                SETTING_TRACE_ERROR("privacy_info_get_privacy_description failed : %d", r);
        }
        SETTING_TRACE("privacy_desc : [%s]", privacy_desc);
-       
+
        r = privacy_info_is_enabled(privacy_info, &enabled);
        if(r != 0){
                SETTING_TRACE_ERROR("privacy_info_is_enabled failed : %d", r);
@@ -174,7 +174,7 @@ static void _privacy_info_cb(const privacy_info_h* privacy_info, void* data)
                SETTING_TRACE_ERROR("ad->privacy_service is NULL");
                return SETTING_RETURN_FAIL;
        }
-       
+
        //ad->privacy_check_list = eina_list_append(ad->privacy_check_list, app_info);
 
        //FREE(privacy_id);
@@ -219,7 +219,7 @@ static int setting_privacy_service_create(void *cb)
        char *pkg_id = NULL;
        service_h service = ad->bundle_data;
        service_get_extra_data(service, "pkg_id", &pkg_id);
-       
+
        //need to pkgname from pkgid(pkgmgr)
        ad->pkg_id = strdup(pkg_id);
        SETTING_TRACE("pkgid [%s]", ad->pkg_id);
@@ -232,17 +232,17 @@ static int setting_privacy_service_create(void *cb)
 
        // itc
        setting_create_Gendial_itc("1text.1icon.3", &(ad->itc_1text_1icon));
-       
+
        Elm_Object_Item *item = NULL;
        Evas_Object *scroller = NULL;
        ad->ly_main =
            setting_create_layout_navi_bar_genlist(ad->win_main_layout,
                                                   ad->win_get,
                                                   ad->pkg_label,
-                                                  _("IDS_COM_BODY_BACK"),
-                                                  NULL, //_("IDS_COM_SK_OK")
-                                                  setting_privacy_service_click_softkey_back_cb,
-                                                  NULL,
+                                                  NULL, //_("IDS_COM_BODY_BACK"),
+                                                  _("IDS_COM_SK_OK"), //
+                                                  NULL, //setting_privacy_service_click_softkey_back_cb,
+                                                  setting_privacy_service_click_softkey_ok_cb,
                                                   ad,
                                                   &ad->scroller,
                                                   &(ad->navi_bar));
@@ -276,7 +276,7 @@ static int setting_privacy_service_destroy(void *cb)
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
        SettingPrivacyUG *ad = (SettingPrivacyUG *) cb;
-       
+
        if (ad->view_to_load == &setting_view_privacy_service) {
                if (ad->ly_main) {
                        evas_object_del(ad->ly_main);
@@ -340,6 +340,9 @@ static void setting_privacy_service_click_softkey_ok_cb(void *data, Evas_Object
        retm_if(data == NULL, "Data parameter is NULL");
        SettingPrivacyUG *ad = (SettingPrivacyUG *) data;
 
+       /* TEMP:Send destroy request */
+       ug_destroy_me(ad->ug);
+
        SETTING_TRACE_END;
 }
 
@@ -349,8 +352,8 @@ static void setting_privacy_service_list_Gendial_mouse_up_cb(void *data, Evas_Ob
        SETTING_TRACE_BEGIN;
        /* error check */
        retm_if(data == NULL, "Data parameter is NULL");
-       SettingPrivacyUG *ad = (SettingPrivacyUG *) data;       
-       
+       SettingPrivacyUG *ad = (SettingPrivacyUG *) data;
+
        retm_if(event_info == NULL, "Invalid argument: event info is NULL");
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        elm_genlist_item_selected_set(item, 0);
@@ -376,7 +379,7 @@ static void setting_privacy_service_list_Gendial_chk_btn_cb(void *data, Evas_Obj
        //retm_if(data == NULL, "Data parameter is NULL");
        //SettingPrivacyUG *ad = (SettingPrivacyUG *) data;
        SettingPrivacyUG *ad = NULL;
-       
+
        retm_if(data == NULL, "Data parameter is NULL");
        Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *) data;
        ad = list_item->userdata;

diff --git a/setting-privacy/src/setting-privacy.c b/setting-privacy/src/setting-privacy.c
index baf42d3..b5bb6dc 100755 (executable)
--- a/setting-privacy/src/setting-privacy.c
+++ b/setting-privacy/src/setting-privacy.c
@@ -45,7 +45,7 @@ setting_view *__get_privacy_view_to_load(void *data, service_h service)
 
        // service OK, but there's no argument
        if(ret == SERVICE_ERROR_NONE
-               && 0 == safeStrCmp(output_url, "http://tizen.org/appcontrol/operation/configure/priavacy/service")
+               && 0 == safeStrCmp(output_url, "http://tizen.org/appcontrol/operation/configure/privacy/service")
                || 0 == safeStrCmp(output_url, "http://samsung.com/appcontrol/operation/configure/privacy/service"))
        {
                setting_view_node_table_register(&setting_view_privacy_service, NULL);