check nfc feature before adding menupatchset2. apply comment .
authorJing Yigang <yigang.jing@samsung.com>
Tue, 28 Aug 2012 03:40:15 +0000 (11:40 +0800)
committerJing Yigang <yigang.jing@samsung.com>
Tue, 28 Aug 2012 03:40:15 +0000 (11:40 +0800)
Change-Id: Ie387cd6fa9b9355dc274f7ed625bfa1a746c16f0

src/setting-main.c

index 7241a60..eae52b9 100755 (executable)
@@ -462,11 +462,6 @@ static Setting_GenGroupItem_Data * __nfc_handler(void* data, char* keyStr, char*
 {
        setting_main_appdata *ad = (setting_main_appdata *)data;
 
-       int nfc_value = FALSE; //default
-       vconf_get_bool(VCONFKEY_NFC_FEATURE, &nfc_value);
-       //if (VCONFKEY_NFC_FEATURE_ON != nfc_value)
-       //      continue;
-
        ad->data_nfc = setting_create_Gendial_field_groupitem(genlist,
                                                   &(ad->itc[GENDIAL_Type_1icon_2text]),
                                                   NULL,
@@ -634,9 +629,12 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_
                                mainlist_table[MAINLIST_ENTRY_NETWORK].ui_handler(ad, keyStr, icon_path, ug_args, genlist);
 
                        } else if (!safeStrCmp(KeyStr_NFC, keyStr) && is_ug_installed_by_ug_args(ug_args)) {    /* load special icon */
-
-                               mainlist_table[MAINLIST_ENTRY_NFC].ui_handler(ad, keyStr, icon_path, ug_args, genlist);
-
+                               int nfc_value = FALSE; //default
+                               vconf_get_bool(VCONFKEY_NFC_FEATURE, &nfc_value);
+                               if (VCONFKEY_NFC_FEATURE_ON == nfc_value)
+                               {
+                                       mainlist_table[MAINLIST_ENTRY_NFC].ui_handler(ad, keyStr, icon_path, ug_args, genlist);
+                               }
                        } else {        /* load other UGs */
                                if (is_ug_installed_by_ug_args(ug_args))
                                {