Merge "Fix P120905-5631" into 2.0_beta

[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 61c6cd8..8bd8031 100755 (executable)
--- a/setting-network/src/setting-network-main.c
+++ b/setting-network/src/setting-network-main.c
@@ -303,9 +303,11 @@ static int setting_network_main_create(void *cb)
        }
 
        setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
-                                        ad, SWALLOW_Type_LAYOUT_SPECIALIZTION,
+                                        ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
                                         NULL, NULL, 0, Data_packet_Desc, NULL,
                                         NULL);
+       elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
+                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        /* data roaming */
        int value_data_roaming = 0;
@@ -343,9 +345,11 @@ static int setting_network_main_create(void *cb)
        }
 
        setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL,
-                                        ad, SWALLOW_Type_LAYOUT_SPECIALIZTION,
+                                        ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
                                         NULL, NULL, 0, SETTING_NETWORK_DATA_ROMING_DESC, NULL,
                                         NULL);
+       elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL),
+                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
 
        /* (void)setting_create_Gendial_field_titleItem(scroller, &(ad->itc_group_item), speciliztion, NULL); */
@@ -363,11 +367,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,12 +381,12 @@ 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));
                }
 
                ad->data_sel_net = setting_create_Gendial_field_def(scroller,