Disable Wi-fi / Tethering / Network menu in calling,disable 'Network' when flight...

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

diff --git a/setting-network/src/setting-network-main.c b/setting-network/src/setting-network-main.c
index 8bd8031..2d53d1d 100755 (executable)
--- a/setting-network/src/setting-network-main.c
+++ b/setting-network/src/setting-network-main.c
@@ -354,56 +354,49 @@ static int setting_network_main_create(void *cb)
 
        /* (void)setting_create_Gendial_field_titleItem(scroller, &(ad->itc_group_item), speciliztion, NULL); */
 
-       /*  check flight mode */
-       int flight_mode, err;
-       setting_get_bool_slp_key(BOOL_SLP_SETTING_FLIGHT_MODE, &flight_mode,
-                                &err);
-       /** @todo check 'err' variable for exception handling */
-       SETTING_TRACE("flight_mode:%d", flight_mode);
-       char *sub_des = NULL;
-       if (flight_mode == 0) {
-               /*  ***BEGIN***  Fixed the problem of word twinkle  SAMSUNG 2010/7/21 add */
-               ad->sel_net = TAPI_NETWORK_SELECTIONMODE_AUTOMATIC;
-               ad->sel_act = TAPI_NETWORK_SYSTEM_NO_SRV;
-               vconf_get_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, &ad->sel_net);
-               vconf_get_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, &ad->sel_act);
-
-               FREE(ad->sel_network);
-               ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
-               SETTING_TRACE("pa_sel_net_name:%s", ad->sel_network);
-               if (isEmptyStr(ad->sel_network)) {
-                   ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
-               }
-               SETTING_TRACE("pa_net_name:%s", ad->sel_network);
-               SETTING_TRACE("old act:%d", ad->sel_act);
-               SETTING_TRACE("old network mode:%d", ad->sel_net);
-
-               char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
-               if (TAPI_NETWORK_SELECTIONMODE_MANUAL == value) {
-                       snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                "%s, %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
-                                setting_network_get_act_str(ad->sel_act));
-               }
-               else{
-                       snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
-                                "%s, %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
-               }
+       /*  Don't need to check flight mode,if flight mode is on, thw whole Network function will be disable*/
+       /*  ***BEGIN***  Fixed the problem of word twinkle  SAMSUNG 2010/7/21 add */
+       ad->sel_net = TAPI_NETWORK_SELECTIONMODE_AUTOMATIC;
+       ad->sel_act = TAPI_NETWORK_SYSTEM_NO_SRV;
+       vconf_get_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, &ad->sel_net);
+       vconf_get_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, &ad->sel_act);
+
+       FREE(ad->sel_network);
+       ad->sel_network = vconf_get_str(VCONFKEY_TELEPHONY_NWNAME);
+       SETTING_TRACE("pa_sel_net_name:%s", ad->sel_network);
+       if (isEmptyStr(ad->sel_network)) {
+           ad->sel_network = strndup("IDS_ST_BODY_NOSERVICE", strlen("IDS_ST_BODY_NOSERVICE")+1);
+       }
+       SETTING_TRACE("pa_net_name:%s", ad->sel_network);
+       SETTING_TRACE("old act:%d", ad->sel_act);
+       SETTING_TRACE("old network mode:%d", ad->sel_net);
+
+       char sel_network_desc[MAX_COMMON_BUFFER_LEN] = { 0, };
+       if (TAPI_NETWORK_SELECTIONMODE_MANUAL == value) {
+               snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
+                        "%s, %s (%s)", _("IDS_COM_BODY_MANUAL"), _(ad->sel_network),
+                        setting_network_get_act_str(ad->sel_act));
+       }
+       else{
+               snprintf(sel_network_desc, MAX_COMMON_BUFFER_LEN,
+                        "%s, %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
+       }
 
-               ad->data_sel_net = setting_create_Gendial_field_def(scroller,
-                                            &itc_2text_3,
-                                            setting_network_main_item_Gendial_mouse_up_cb,
-                                            ad, SWALLOW_Type_INVALID,
-                                            NULL, NULL, 0,
-                                            "IDS_ST_BODY_SELECT_NETWORK",
-                                            sel_network_desc, NULL);
-               if (ad->data_sel_net) {
-                       ad->data_sel_net->userdata = ad;
-               } else {
-                       SETTING_TRACE_ERROR("ad->data_sel_net is NULL");
-               }
+       ad->data_sel_net = setting_create_Gendial_field_def(scroller,
+                                    &itc_2text_3,
+                                    setting_network_main_item_Gendial_mouse_up_cb,
+                                    ad, SWALLOW_Type_INVALID,
+                                    NULL, NULL, 0,
+                                    "IDS_ST_BODY_SELECT_NETWORK",
+                                    sel_network_desc, NULL);
+       if (ad->data_sel_net) {
+               ad->data_sel_net->userdata = ad;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_sel_net is NULL");
        }
        /*  ***BEGIN***  Fixed the problem of word twinkle  SAMSUNG 2010/7/21 add */
        /* hide NETWORK MODE in Emulator*/
+       char *sub_des = NULL;
        k = vconf_get_int(VCONFKEY_SETAPPL_NETWORK_MODE_INT, &value);
        if (-1 != k) {
                SETTING_TRACE("value:%d", value);