Fix network UI issue and fix P120829-5114,P120829-5115

[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 2dad726..0dfa24c 100755 (executable)
--- a/setting-network/src/setting-network-main.c
+++ b/setting-network/src/setting-network-main.c
@@ -363,11 +363,11 @@ static int setting_network_main_create(void *cb)
                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 (NULL == 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);
@@ -377,69 +377,65 @@ static int setting_network_main_create(void *cb)
                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),
+                                "%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));
+                                "%s, %s", _("IDS_COM_BODY_AUTOMATIC"), _(ad->sel_network));
                }
 
-               /* hide SELECT NETWORK in Emulator*/
-               if (!isEmulBin()) {
-                       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*/
-       if (!isEmulBin()) {
-               k = vconf_get_int(VCONFKEY_SETAPPL_NETWORK_MODE_INT, &value);
-               if (-1 != k) {
-                       SETTING_TRACE("value:%d", value);
-                       switch (value) {
-                       case TAPI_NETWORK_BAND_TYPE_ANY:
-                               sub_des = _("IDS_COM_BODY_AUTOMATIC");
-                               break;
-                       case TAPI_NETWORK_BAND_TYPE_GSM_900_1800:
-                               sub_des = _(STR_SETTING_GSM_900_1800);
-                               break;
-                       case TAPI_NETWORK_BAND_TYPE_GSM_850_1900:
-                               sub_des = _(STR_SETTING_GSM_850_1900);
-                               break;
-                       case TAPI_NETWORK_BAND_TYPE_WCDMA:
-                               sub_des = _(STR_SETTING_UMTS);
-                               break;
-                       default:
-                               break;
-                       }
+       k = vconf_get_int(VCONFKEY_SETAPPL_NETWORK_MODE_INT, &value);
+       if (-1 != k) {
+               SETTING_TRACE("value:%d", value);
+               switch (value) {
+               case TAPI_NETWORK_BAND_TYPE_ANY:
+                       sub_des = _("IDS_COM_BODY_AUTOMATIC");
+                       break;
+               case TAPI_NETWORK_BAND_TYPE_GSM_900_1800:
+                       sub_des = _(STR_SETTING_GSM_900_1800);
+                       break;
+               case TAPI_NETWORK_BAND_TYPE_GSM_850_1900:
+                       sub_des = _(STR_SETTING_GSM_850_1900);
+                       break;
+               case TAPI_NETWORK_BAND_TYPE_WCDMA:
+                       sub_des = _(STR_SETTING_UMTS);
+                       break;
+               default:
+                       break;
                }
+       }
 
-               ad->data_net_mode =
-                   setting_create_Gendial_exp_parent_field(scroller,
-                                                           &itc_2text_3_parent,
-                                                           NULL, NULL,
-                                                           SWALLOW_Type_INVALID,
-                                                           "IDS_ST_BODY_NETWORK_MODE",
-                                                           sub_des);
-               if (ad->data_net_mode) {
-                       ad->data_net_mode->int_slp_setting_binded =
-                               INT_SLP_SETTING_NETWORK_MODE;
-                       ad->data_net_mode->userdata = ad;
-               } else {
-                       SETTING_TRACE_ERROR("ad->data_back is NULL");
-               }
+       ad->data_net_mode =
+           setting_create_Gendial_exp_parent_field(scroller,
+                                                   &itc_2text_3_parent,
+                                                   NULL, NULL,
+                                                   SWALLOW_Type_INVALID,
+                                                   "IDS_ST_BODY_NETWORK_MODE",
+                                                   sub_des);
+       if (ad->data_net_mode) {
+               ad->data_net_mode->int_slp_setting_binded =
+                       INT_SLP_SETTING_NETWORK_MODE;
+               ad->data_net_mode->userdata = ad;
+       } else {
+               SETTING_TRACE_ERROR("ad->data_back is NULL");
        }
+
        setting_create_Gendial_field_def(scroller, &itc_1text,
                                         setting_network_main_item_Gendial_mouse_up_cb,
                                         ad, SWALLOW_Type_INVALID, NULL, NULL,