Merge "change manifest for smack"

[apps/core/preloaded/settings.git] / src / setting-main.c

diff --git a/src/setting-main.c b/src/setting-main.c
index 58dd80c..bc8d9ab 100755 (executable)
--- a/src/setting-main.c
+++ b/src/setting-main.c
@@ -26,6 +26,7 @@
 #include <setting-main.h>
 #include <setting-plugin.h>
 
+#define PLUGIN_PATH_FORMAT             "/opt/apps/%s/setting/setting.xml"
 
 typedef struct DrawAppInfo DrawAppInfo;
 typedef struct DrawAppInfo
@@ -590,6 +591,8 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
                                        continue; /* hide Network in Emulator*/
                                } else if (!safeStrCmp(KeyStr_Bluetooth, keyStr)) {
                                        continue; /* hide Bluetooth in Emulator*/
+                               } else if (!safeStrCmp(KeyStr_MobileAP, keyStr)) {
+                                       continue; /* hide Tethering in Emulator*/
                                } else {
                                        /* do nothing */
                                }
@@ -954,13 +957,13 @@ static void __load_applications_level_all_list(void *data)
        __load_applications_menu_list(ad, Cfg_Item_Pos_Level_All);
 }
 
+
 bool is_3rdapp_installed_setting_cfg(char* pkgname)
 {
        SETTING_TRACE_BEGIN;
-       // /opt/apps/
        char path[512];
 
-       if (snprintf(path, 512, "/opt/apps/%s/setting/setting.xml", pkgname) < 0)
+       if (snprintf(path, 512, PLUGIN_PATH_FORMAT, pkgname) < 0)
                return false;
 
        struct stat st;
@@ -976,7 +979,6 @@ bool is_3rdapp_installed_setting_cfg(char* pkgname)
        return result_opt;
 }
 
-
 /**
  * @param data
  */
@@ -991,7 +993,7 @@ static void draw_3rdapp(void* data, char* name, char* pkgname)
        //3rd cfg
        char fullpath[512];
 
-       if (snprintf(fullpath, 512, "/opt/apps/%s/setting/setting.xml", pkgname) < 0)
+       if (snprintf(fullpath, 512, PLUGIN_PATH_FORMAT, pkgname) < 0)
                return false;
 
        SETTING_TRACE(" fullpath : %s", fullpath);
@@ -2264,7 +2266,7 @@ void setting_main_list_mouse_up_cb(void *data, Evas_Object *eo,
 
        SETTING_TRACE("change radio[%s], status is:%d", _(list_item->keyStr),
                      list_item->chk_status);
-       /*setting_main_appdata *ad = g_main_ad;*/
+       setting_main_appdata *ad = g_main_ad;
 
        if (!safeStrCmp(KeyStr_UsePacketData, list_item->keyStr)) {
                int err;