move install path of langlist.xml

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

diff --git a/src/setting.c b/src/setting.c
index 160ca25..3236d60 100755 (executable)
--- a/src/setting.c
+++ b/src/setting.c
@@ -21,7 +21,7 @@
 #include <Ecore_X.h>
 #include <sensor.h>
 #include <aul.h>
-#include "setting-plugin.h"
+#include "setting-common-plugin.h"
 #include "setting-main.h"
 #include <elm_object.h>
 #include <appsvc.h>
@@ -563,20 +563,17 @@ static void setting_int_vconf_change_cb(keynode_t *key, void *data)
        }
        else if (!safeStrCmp(vconf_name, VCONFKEY_CALL_STATE)) {
        // do handling in case of VCONFKEY_CALL_STATE
-               //In call situation : Wi-fi / Tethering / Network menu dimmed
+               // In call situation : Wi-fi / Tethering / Network menu dimmed
+               // --                                   Only Wi-fi should be dimmed (2013.04.04) --
                if (VCONFKEY_CALL_OFF != status)
                {
                        if (ad->data_network)
                                setting_disable_genlist_item(ad->data_network->item);
-                       if (ad->data_wifi)
-                               setting_disable_genlist_item(ad->data_wifi->item);
                }
                else
                {
                        if (ad->data_network)
                                setting_enable_genlist_item(ad->data_network->item);
-                       if (ad->data_wifi)
-                               setting_enable_genlist_item(ad->data_wifi->item);
                }
 
        } else if (!safeStrCmp(vconf_name, VCONFKEY_BT_STATUS)) {
@@ -838,7 +835,7 @@ static int setting_main_app_terminate(void *data)
        SETTING_TRACE_BEGIN;
        setting_main_appdata *ad = data;
        //vconf_set_bool (VCONFKEY_SETAPPL_ROTATE_HOLD_BOOL, FALSE);
-       PLUGIN_FINI;
+
        setting_cfg_exit();
        clear_system_service_data();