X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fsetting.c;h=3236d60014354f7462079bcd220877dbe5015bec;hb=fae3fd8aa8b4ea40c3b18f3edfe3ef3a7bd94078;hp=de28fff9a270dd5a00720bf6754c653a39a92cef;hpb=edb39591c3fd6da9bcdc1dda395bae571c5baeb1;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

diff --git a/src/setting.c b/src/setting.c
index de28fff..3236d60 100755
--- 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>
@@ -488,13 +488,14 @@ static void setting_other_vconf_change_cb(keynode_t *key, void *data)
 		int status = 0;
 		vconf_get_bool(VCONFKEY_NFC_STATE, &status);
 
+		item_to_update->swallow_type = SWALLOW_Type_1ICON_1RADIO;
 		item_to_update->chk_status = status;
 		//do not need delay for checks
 		elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
 		SETTING_TRACE("item_to_update->chk_status:%d", item_to_update->chk_status);
 
-		item_to_update->sub_desc = (char *)g_strdup(get_NFC_on_off_str());
-		SETTING_TRACE_DEBUG("%s", item_to_update->sub_desc);
+		//item_to_update->sub_desc = (char *)g_strdup(get_NFC_on_off_str());
+		//SETTING_TRACE_DEBUG("%s", item_to_update->sub_desc);
 
 		if (ad->bAppPause || ad->ug) {
 			ad->updateItems[GL_ITEM_NFC] = EINA_TRUE;
@@ -518,10 +519,8 @@ static void setting_int_vconf_change_cb(keynode_t *key, void *data)
 	char *vconf_name = vconf_keynode_get_name(key);
 	SETTING_TRACE("Enter %s(%s=%d)", __FUNCTION__, vconf_name, status);
 
-	char *pa_wifi_device = NULL;
 	Setting_GenGroupItem_Data* item_to_update = NULL;
 
-
 	if (!safeStrCmp(vconf_name, VCONFKEY_WIFI_STATE)) {
 	// do handling in case of VCONFKEY_WIFI_STATE
 		item_to_update = ad->data_wifi;
@@ -529,7 +528,7 @@ static void setting_int_vconf_change_cb(keynode_t *key, void *data)
 
 		switch (status) {
 		case VCONFKEY_WIFI_OFF:
-			item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_OFF_M_STATUS"));
+			//item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_OFF_M_STATUS"));
 
 			item_to_update->chk_status = EINA_FALSE;
 			break;
@@ -537,13 +536,13 @@ static void setting_int_vconf_change_cb(keynode_t *key, void *data)
 		case VCONFKEY_WIFI_UNCONNECTED:
 		case VCONFKEY_WIFI_CONNECTED:
 		case VCONFKEY_WIFI_TRANSFER:
-			pa_wifi_device = vconf_get_str(VCONFKEY_WIFI_CONNECTED_AP_NAME);
-			if (NULL != pa_wifi_device && '\0' != pa_wifi_device[0]) {
-				item_to_update->sub_desc = (char *)g_strdup(pa_wifi_device);
-			} else {
-				item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_ON_M_STATUS"));
-			}
-			FREE(pa_wifi_device);
+			//pa_wifi_device = vconf_get_str(VCONFKEY_WIFI_CONNECTED_AP_NAME);
+			//if (NULL != pa_wifi_device && '\0' != pa_wifi_device[0]) {
+			//	item_to_update->sub_desc = (char *)g_strdup(pa_wifi_device);
+			//} else {
+			//	item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_ON_M_STATUS"));
+			//}
+			//FREE(pa_wifi_device);
 
 			item_to_update->chk_status = EINA_TRUE;
 			break;
@@ -552,6 +551,7 @@ static void setting_int_vconf_change_cb(keynode_t *key, void *data)
 			return;
 		}
 
+		item_to_update->swallow_type = SWALLOW_Type_1ICON_1RADIO;
 		elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
 
 		if (ad->bAppPause || ad->ug) {
@@ -563,36 +563,35 @@ 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)) {
+	// do handling in case of VCONFKEY_BT_STATUS
 		item_to_update = ad->data_bt;
 		retm_if(!item_to_update, "ad->data_bt is NULL");
-
+/*
 		if (FALSE == status) {
-			item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_OFF_M_STATUS"));
+		//	item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_OFF_M_STATUS"));
 
 			item_to_update->chk_status = EINA_FALSE;
 		} else {
-			item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_ON_M_STATUS"));
+			//item_to_update->sub_desc = (char *)g_strdup(_("IDS_COM_BODY_ON_M_STATUS"));
 
 			item_to_update->chk_status = EINA_TRUE;
 		}
-
+*/
+		item_to_update->swallow_type = SWALLOW_Type_1ICON_1RADIO;
 		item_to_update->chk_status = status;
 		elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
 
@@ -653,10 +652,11 @@ static void setting_string_vconf_change_cb(keynode_t *key, void *data)
 		SETTING_TRACE("status:%d", status);
 		switch (status) {
 		case VCONFKEY_WIFI_OFF:
-			item_to_update->sub_desc =
-				(char *)g_strdup(setting_gettext ("IDS_COM_BODY_OFF_M_STATUS"));
+			//item_to_update->sub_desc =
+			//	(char *)g_strdup(setting_gettext ("IDS_COM_BODY_OFF_M_STATUS"));
 
 			item_to_update->chk_status = EINA_FALSE;
+			item_to_update->swallow_type = SWALLOW_Type_1ICON_1RADIO;
 			elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
 			break;
 
@@ -665,13 +665,14 @@ static void setting_string_vconf_change_cb(keynode_t *key, void *data)
 		case VCONFKEY_WIFI_TRANSFER:
 			if (NULL != value && '\0' != value[0]) {
 				SETTING_TRACE("wifi_device:%s", value);
-				item_to_update->sub_desc = (char *)g_strdup(value);
+				//item_to_update->sub_desc = (char *)g_strdup(value);
 			} else {
-				item_to_update->sub_desc =
-					(char *) g_strdup(setting_gettext ("IDS_COM_BODY_ON_M_STATUS"));
+				//item_to_update->sub_desc =
+				//	(char *) g_strdup(setting_gettext ("IDS_COM_BODY_ON_M_STATUS"));
 			}
 
 			item_to_update->chk_status = EINA_TRUE;
+			item_to_update->swallow_type = SWALLOW_Type_1ICON_1RADIO;
 			elm_check_state_set(item_to_update->eo_check, item_to_update->chk_status);
 			break;
 		default:
@@ -834,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();