Revert "Launch points"

This reverts commit b15760479d5cadc6257bb7268d5689a13bef8764.

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

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index aa2bd9a9761b34125565f0fb4c40ede6515c48d3..c42dd1f72b3d1c5177ec6f5cbedad6551fcc8e2e 100644 (file)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -182,7 +182,7 @@ static Setting_Cfg_Node_T s_cfg_node_array[] = {
        {KeyStr_WiFi, IMG_WiFi, "wifi-efl-ug", Cfg_Item_Pos_Level0, Cfg_Item_Resetable,   0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_Connections, &wifi_tfunc, uuid_WiFi, 0, "wifi-efl-ug"},
        {KeyStr_Bluetooth, IMG_Bluetooth, "ug-bluetooth-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable,  0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_Connections, &bluetooth_tfunc, uuid_Bluetooth, 0, "ug-bluetooth-efl"},
 #ifdef TIZEN_BUILD_TARGET
-       {KeyStr_FlightMode, IMG_FlightMode, "setting-flightmode-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable,  0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_Connections, &flightmode_tfunc, uuid_FlightMode, 0, "org.tizen.setting-flightmode"},
+       {KeyStr_FlightMode, IMG_FlightMode, "setting-flightmode-efl", Cfg_Item_Pos_Level0, Cfg_Item_unResetable,  0, Cfg_Item_Ui_Node_Toggle, NULL, KeyStr_Connections, &flightmode_tfunc, uuid_FlightMode, 0, NULL},
 #endif
 
 #ifdef TIZEN_BUILD_EMULATOR
@@ -201,7 +201,7 @@ static Setting_Cfg_Node_T s_cfg_node_array[] = {
        /* Group:Device */
        {KeyStr_Device, NULL, "move://Tab3.top", Cfg_Item_Pos_Level0, 0, 0, Cfg_Item_Title_Node, NULL, NULL, NULL, uuid_SoundDisplay, 0, NULL},
        {KeyStr_Sounds, IMG_Sounds, "setting-profile-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_Device, NULL, uuid_SoundDisplay, 0, NULL},
-       {KeyStr_Display, IMG_Display, "setting-display-efl|viewtype:main", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_Device, NULL, uuid_Display, 0, "org.tizen.setting-display"},
+       {KeyStr_Display, IMG_Display, "setting-display-efl|viewtype:main", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_Device, NULL, uuid_Display, 0, "org.tizen.setting.display"},
        {KeyStr_ApplicationsItem, IMG_Applications, "setting-applications-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_Device, NULL, uuid_Display, 0, "org.tizen.setting.display"},
 
        /* Group: Personal */
@@ -222,7 +222,7 @@ static Setting_Cfg_Node_T s_cfg_node_array[] = {
 #endif
        {KeyStr_DateTime, IMG_DateTime, "setting-time-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_System, NULL, uuid_DateTime, 0, NULL},
        /*{KeyStr_DeveloperOption, IMG_USBconnection, "setting-developeroption-efl|viewtype:usb", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_DeviceMange, NULL, uuid_DeveloperOption, 0, "org.tizen.setting.developeroptions"}, */
-       {KeyStr_AboutDevice, IMG_AboutDevice, "setting-about-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_AppLauncher_Node, NULL, KeyStr_System, NULL, uuid_AboutPhone, 0, "org.tizen.setting-about"},
+       {KeyStr_AboutDevice, IMG_AboutDevice, "setting-about-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_System, NULL, uuid_AboutPhone, 0, NULL},
 
 #if 0
        {KeyStr_Security, IMG_Security, "setting-security-efl", Cfg_Item_Pos_Level0, Cfg_Item_Resetable, 0, Cfg_Item_Ug_Node, NULL, KeyStr_DeviceMange, NULL, uuid_Security, 0,  NULL},

diff --git a/src/setting-handler.c b/src/setting-handler.c
index c2d6cfbddaa59b4d8e5f68e874930f1dda4b6934..78b21e23baeef5e059d3e19b3c6fe7dcb45a49c1 100644 (file)
--- a/src/setting-handler.c
+++ b/src/setting-handler.c
@@ -265,7 +265,7 @@ void setting_main_click_list_ex_ug_cb(void *data, Evas_Object *obj,
                return;
        }
        if (pnode && pnode->item_type == Cfg_Item_AppLauncher_Node) {
-               if (app_launcher(pnode->shortcut_appid) == 0) {
+               if (app_launcher(data) == 0) {
                        ad->event_freeze_timer = ecore_timer_add(1, setting_main_freeze_event_timer_cb, ad);
                        evas_object_freeze_events_set(ad->navibar_main, EINA_TRUE);
                }
@@ -283,7 +283,6 @@ void setting_main_click_list_ex_ug_cb(void *data, Evas_Object *obj,
        cbs->priv = (void *)ad;
 
        char *path = get_ug_path_from_ug_args(data);
-
        app_control_h svc = get_bundle_from_ug_args(data);
        setting_main_click_list_item_ug_cb(ad, obj, path, svc, cbs);
        if (path) {