From 9029fa7b5d7d96d9b60d4f3f707c147311f26544 Mon Sep 17 00:00:00 2001 From: MyoungJune Park Date: Tue, 18 Dec 2012 16:43:45 +0900 Subject: [PATCH] fixed plugin file path --- src/setting-main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/setting-main.c b/src/setting-main.c index 695fbdd..72c1075 100755 --- a/src/setting-main.c +++ b/src/setting-main.c @@ -29,6 +29,8 @@ #include #include +#define PLUGIN_PREFIX "/opt" + typedef struct _DrawAppInfo { int ncount; @@ -1051,13 +1053,14 @@ 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; char path[512]; SETTING_TRACE("1"); - if (snprintf(path, 512, "/usr/apps/%s/setting/setting.xml", pkgname) < 0) + if (snprintf(path, 512, PLUGIN_PREFIX"/apps/%s/setting/setting.xml", pkgname) < 0) return false; struct stat st; @@ -1086,8 +1089,7 @@ static void draw_3rdapp(void* data, char* name, char* pkgname) //3rd cfg char fullpath[512]; - - if (snprintf(fullpath, 512, "/usr/apps/%s/setting/setting.xml", pkgname) < 0) + if (snprintf(fullpath, 512, PLUGIN_PREFIX"/apps/%s/setting/setting.xml", pkgname) < 0) return; SETTING_TRACE(" fullpath : %s", fullpath); @@ -1125,7 +1127,7 @@ static ail_cb_ret_e __download_apps_cb(ail_appinfo_h ai, void* data) if (AIL_ERROR_OK == ail_appinfo_get_str(ai, AIL_PROP_PACKAGE_STR, &id)) { - //SETTING_TRACE(" 3rd party - app name : ----> %s ", id); + SETTING_TRACE(" 3rd party - app name : ----> %s ", id); } ail_appinfo_h handle; @@ -2261,7 +2263,6 @@ void __alternate_wifi_mode(Evas_Object *check) setting_retm_if(ret < 0, "*** [ERR] wifi_deactivate() ***"); } - ret = wifi_deinitialize(); setting_retm_if(ret < 0, "*** [ERR] wifi_deinitialize() ***"); @@ -2288,13 +2289,13 @@ void __alternate_bt_mode(Evas_Object *check) setting_retm_if(ret < 0, "*** [ERR] bt_adapter_disable() ***"); } - + ret = bt_deinitialize(); setting_retm_if(ret < 0, "*** [ERR] bt_deinitialize() ***"); SETTING_TRACE_END; } - + void __alternate_nfc_mode(Evas_Object *check) { SETTING_TRACE_BEGIN; @@ -2309,7 +2310,7 @@ void __alternate_nfc_mode(Evas_Object *check) ret = nfc_manager_set_activation(status, NULL, NULL); setting_retm_if(ret < 0, "*** [ERR] nfc_manager_set_activation() ***"); - + ret = nfc_manager_deinitialize(); setting_retm_if(ret < 0, "*** [ERR] nfc_manager_deinitialize() ***"); -- 2.7.4