replace ug_create() with app_control ()

- ug-lockscreen-setting-efl
- ug-setting-notofocation-efl
- ug-setting-homescreen-efl

Change-Id: Ia7dada11393650fa19c134d16cf34aca8ef257f3
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/setting-applications/src/setting-applications-defaultapp.c b/setting-applications/src/setting-applications-defaultapp.c
index ff4f6db1ea287c3bf33381e16e14196eac4db268..7cdd47cfc6ce5140313c231b8fa24f6ac759545d 100644 (file)
--- a/setting-applications/src/setting-applications-defaultapp.c
+++ b/setting-applications/src/setting-applications-defaultapp.c
@@ -283,6 +283,9 @@ static gboolean setting_applications_create_homescreen_setting_ug(void *data)
                SETTING_TRACE("Font UG is already loaded.");
                return FALSE;
        }
+
+
+#if 0  
        struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
 
        if (!cbs) {
@@ -301,7 +304,9 @@ static gboolean setting_applications_create_homescreen_setting_ug(void *data)
                evas_object_show(ad->ly_main);
        }
        FREE(cbs);
-
+#else
+       app_launcher("setting-homescreen-efl");
+#endif
        return TRUE;
 }
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 5bddd21def9750f88068b12df5fdd5e78740a477..52e3972fb10d5f51f2c5436fc5874e9b5fbe3b57 100644 (file)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -1187,6 +1187,7 @@ setting_sound_main_mouse_up_Gendial_list_cb(void *data,
                setting_sound_main_create_myfile_ug(ad, list_item->keyStr);
                __setting_sound_ug_key_ungrab(ad);
        } else if (!safeStrCmp("IDS_ST_MBODY_DO_NOT_DISTURB_ABB", list_item->keyStr)) {
+#if 0
                SettingProfileUG *ad = (SettingProfileUG *) data;
                struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
                setting_retm_if(!cbs, "calloc failed");
@@ -1200,8 +1201,11 @@ setting_sound_main_mouse_up_Gendial_list_cb(void *data,
                SETTING_TRACE("To load ug[%s]", "ug-setting-notification-do-not-disturb-efl");
                ug_create(ad->ug, "ug-setting-notification-do-not-disturb-efl", UG_MODE_FULLVIEW, NULL, cbs);
                FREE(cbs);
-
+#else
+               app_launcher("ug-setting-notification-do-not-disturb-efl");
+#endif
        } else if (!safeStrCmp("IDS_ST_MBODY_APP_NOTIFICATIONS", list_item->keyStr)) {
+#if 0
                SettingProfileUG *ad = (SettingProfileUG *) data;
                struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
                setting_retm_if(!cbs, "calloc failed");
@@ -1215,6 +1219,9 @@ setting_sound_main_mouse_up_Gendial_list_cb(void *data,
                SETTING_TRACE("To load ug[%s]", "ug-setting-notification-app-notifications-efl");
                ug_create(ad->ug, "ug-setting-notification-app-notifications-efl", UG_MODE_FULLVIEW, NULL, cbs);
                FREE(cbs);
+#else
+               app_launcher("ug-setting-notification-app-notifications-efl");
+#endif
 
        }
        /* additional */

diff --git a/setting-security/src/setting-security-main.c b/setting-security/src/setting-security-main.c
index 8956a242efb974b65cedd68eee5bf15f025ecf4b..2e6f1d59c081a3a8aee1f36fef183d326eedf51e 100644 (file)
--- a/setting-security/src/setting-security-main.c
+++ b/setting-security/src/setting-security-main.c
@@ -342,7 +342,7 @@ static Eina_Bool _check_tapi_async_cb_is_called(void *data)
        return EINA_FALSE;
 }
 
-Eina_Bool __freeze_event_timer_cb(void *cb)
+static Eina_Bool __freeze_event_timer_cb(void *cb)
 {
        SETTING_TRACE_BEGIN;
        retv_if(cb == NULL, EINA_FALSE);
@@ -411,9 +411,9 @@ setting_security_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj,
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
 
        if (!safeStrCmp(KeyStr_LockScreen, list_item->keyStr)) {
-#if 0
-               int window_id = elm_win_xwindow_get(ad->win_get);
+#if 1
                if (0 == app_launcher("lockscreen-options")) {
+               //if (0 == app_launcher("setting-lockscreen-options-efl")) {
                        ad->update_view_timer = ecore_timer_add(1, __freeze_event_timer_cb, ad);
                        evas_object_freeze_events_set(ad->navi_bar, EINA_TRUE);
                }

diff --git a/setting-security/src/setting-security.c b/setting-security/src/setting-security.c
index 11990d75804964bb8e82275de8eaf137d5f738a1..9889d86362287508a9812273c4715e55ad14b109 100644 (file)
--- a/setting-security/src/setting-security.c
+++ b/setting-security/src/setting-security.c
@@ -1031,6 +1031,7 @@ void setting_security_destroy_lockscreen_options_ug_cb(ui_gadget_h ug,
        }
 }
 
+
 gboolean setting_security_create_lockscreen_options_sg(void *data)
 {
        /* error check */
@@ -1042,6 +1043,11 @@ gboolean setting_security_create_lockscreen_options_sg(void *data)
                SETTING_TRACE("Password UG is already loaded.");
                return FALSE;
        }
+
+
+#if 1
+       app_launcher("lockscreen-options");
+#else
        struct ug_cbs *cbs = (struct ug_cbs *)calloc(1, sizeof(struct ug_cbs));
 
        if (!cbs)
@@ -1060,6 +1066,7 @@ gboolean setting_security_create_lockscreen_options_sg(void *data)
        }
 
        FREE(cbs);
+#endif
 
        return TRUE;
 }