[REFACTOR] The modules of the setting-network app use their static structures to... 46/114046/2
authorMichal Skorupinski <m.skorupinsk@samsung.com>
Thu, 9 Feb 2017 18:00:55 +0000 (19:00 +0100)
committerMichal Skorupinski <m.skorupinsk@samsung.com>
Mon, 20 Feb 2017 13:25:12 +0000 (14:25 +0100)
Change-Id: Ic92f7a36256d8e4aa4dabe5dc0702024d9d1573e
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>
setting-network/include/setting-network-connection-create.h
setting-network/include/setting-network.h
setting-network/src/setting-network-con-list.c
setting-network/src/setting-network-con.c
setting-network/src/setting-network-connection-create.c
setting-network/src/setting-network-main.c
setting-network/src/setting-network-profile-delete.c
setting-network/src/setting-network.c

index 3209b6f0bfbc9ac63c15f9d5ea57656c6966df7a..de3599df9064f21ffbb475036b058a502c8e3eeb 100644 (file)
@@ -21,4 +21,6 @@
 #ifndef __SETTING_NETWORK_CONNECTION_CREATE_H__
 #define __SETTING_NETWORK_CONNECTION_CREATE_H__
 
+void setting_network_connection_create_terminate(void);
+
 #endif                         /* __SETTING_NETWORK_CONNECTION_CREATE_H__ */
index acbd7e6e865c260eaf9063415d91d2c137ec7442..5d1693096f15d7c646cc0a9c6700e5725498316f 100644 (file)
@@ -178,8 +178,6 @@ struct _SettingNetwork {
 
        TapiHandle *handle;
        connection_h connection;
-       connection_profile_h sel_profile_h;
-       setting_view *profile_topper_view;
 
 #if SUPPORT_TETHERING
        tethering_h th_main;
@@ -189,31 +187,7 @@ struct _SettingNetwork {
 #endif
        int profile_service_type;
 
-       Evas_Object *popup_conreset;
-       Evas_Object *popup_conreset_complete;
        Evas_Object *popup;
-       Evas_Object *popup_chk;
-
-       Evas_Object *popup_auth_type;
-       Evas_Object *popup_pdn_type;
-       Evas_Object *popup_data_on;
-       Evas_Object *popup_data_off;
-
-       /*connection, */
-       Elm_Object_Item *navi_it;
-       Elm_Object_Item *navi_it_con_list;
-       Elm_Object_Item *navi_it_profile_del_list;
-
-       /*connection-create */
-       Evas_Object *con_create_gl; /* connection create */
-
-       /*Evas_Object *conformant; */
-       Evas_Object *l_button;
-       Evas_Object *r_button;
-
-       bool has_form_changed;
-       Evas_Object *connections_gl; /* genlist in connections view */
-       Evas_Object *con_list_gl; /* genlist in connections view */
 
        Evas_Object *network_popup;
        char *view_type_string;
@@ -221,78 +195,26 @@ struct _SettingNetwork {
 #ifdef UI_NETWORK_MODE
        Setting_GenGroupItem_Data *data_net_mode;
 #endif
-       Setting_GenGroupItem_Data *service_providers;
-       Setting_GenGroupItem_Data *network_mode_sim_1;
-       Setting_GenGroupItem_Data *network_mode_sim_2;
 
-       Setting_GenGroupItem_Data *data_connection;
        Setting_GenGroupItem_Data *data_mobile_data;
        Setting_GenGroupItem_Data *data_roaming;
-       Setting_GenGroupItem_Data *data_srv_type;
-       Setting_GenGroupItem_Data *internet_conn;
+               Setting_GenGroupItem_Data *internet_conn;
        Setting_GenGroupItem_Data *mms_conn;
-       Setting_GenGroupItem_Data *selected_profile;
 
 #ifdef UI_NETWORK_MODE
        int net_mode; /* like vconf key */
 #endif
 
-       int is_show_user;
        char *con_name;
        char *access_name;
 
-       Evas_Object *chk_type;
-       Evas_Object *chk_type_pdn;
-       Evas_Object *chk_type_roam_pdn;
-
-       char *ed_profile_name_desc;
-       char *ed_acs_name_desc;
-       char *ed_auth_type_desc;
-       char *ed_user_name_desc;
-       char *ed_pwd_desc;
-       char *ed_pxy_addr_desc;
-       char *ed_pxy_port_desc;
-       char *ed_pdn_type_desc;
-       char *ed_roam_pdn_type_desc;
-       char *ed_hm_url_desc;
-       int chkType;
-       int chkType_pdn;
-       int chkType_roam_pdn;
-       int srvType;
-       bool is_editable;
-       Elm_Object_Item *item_above_user_name;
-       Elm_Object_Item *item_above_proxy_add;
-
-       Setting_GenGroupItem_Data *data_user_name;
-       Setting_GenGroupItem_Data *data_pwd;
-       Setting_GenGroupItem_Data *data_acs_name;
-       Setting_GenGroupItem_Data *data_profile_name;
-       Setting_GenGroupItem_Data *data_pxy_addr;
-       Setting_GenGroupItem_Data *data_pxy_port;
-       Setting_GenGroupItem_Data *data_pdn_type;
-       Setting_GenGroupItem_Data *data_roam_pdn_type;
-       Setting_GenGroupItem_Data *data_hm_url;
-       Setting_GenGroupItem_Data *data_auth_type;
-
-       Evas_Object *scl_edit;
-
-       Evas_Object *gl_profile_del;
        Eina_List *profile_list;
-       Eina_List *profile_del_list;
-
-       Evas_Object *rdg;
-
-       /**********************************************/
        setting_view *view_to_load;
        Ecore_Timer *timer;
 
        char *internet_apn_name;
        char *MMS_apn_name;
-       Ecore_Idler *add_apn_timer;
-
        bool init_done;
-
-       /***********************************************/
        int connections_sim_selected;
 };
 
index f8a396ffcdd1284d0d383ab53d6f27e7a9e3ef88..032b060893a62b7d2b7a3c4d0b1923e179ab485f 100755 (executable)
@@ -34,6 +34,13 @@ static void _click_softkey_create_cb(void *data, Evas_Object *obj,
 static void _click_softkey_delete_cb(void *data, Evas_Object *obj,
                void *event_info);
 
+static struct setting_network_con_list_info {
+       Elm_Object_Item *navi_it_con_list;
+       Evas_Object *con_list_gl; /* genlist in connections view */
+       Setting_GenGroupItem_Data *selected_profile;
+       Evas_Object *rdg;
+} s_info = {0,};
+
 setting_view setting_view_network_con_list = {
        .create = _view_create,
        .destroy = _view_destroy,
@@ -176,18 +183,18 @@ static int __con_list_recreate(void *cb)
        SettingNetwork *ad = (SettingNetwork *)cb;
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       genlist = ad->con_list_gl;
+       genlist = s_info.con_list_gl;
        elm_genlist_clear(genlist); /* first to clear list */
 
        radio_group = elm_radio_add(genlist);
        elm_radio_state_value_set(radio_group, -1);
-       ad->rdg = radio_group;
+       s_info.rdg = radio_group;
        /*setting_disable_evas_object(radio_group); */
 
        serviceType = ad->profile_service_type;
        setting_network_reget_profile_list(ad);
 
-       ad->selected_profile = NULL;
+       s_info.selected_profile = NULL;
        EINA_LIST_FOREACH(ad->profile_list, elist, profile_h) {
                apn = name = NULL;
                connection_profile_get_cellular_apn(profile_h, &apn);
@@ -215,7 +222,7 @@ static int __con_list_recreate(void *cb)
 
                if (idx == 0) {
                        /* by default select first item */
-                       ad->selected_profile = item_data;
+                       s_info.selected_profile = item_data;
                }
 
                item_data->item = elm_genlist_item_append(genlist,
@@ -239,7 +246,7 @@ static int __con_list_recreate(void *cb)
                } else if (is_default) {
                        SETTING_TRACE("Default: idx:%d, apn:%s, id:%s", idx,
                                        apn, id);
-                       ad->selected_profile = item_data;
+                       s_info.selected_profile = item_data;
                        elm_radio_value_set(radio_group, idx);
                        if (serviceType == CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
                                FREE(ad->internet_apn_name);
@@ -269,7 +276,7 @@ static int __con_list_recreate(void *cb)
 
        SETTING_TRACE("idx:%d", idx);
        Evas_Object *toolbar = elm_object_item_part_content_get(
-                       ad->navi_it_con_list, "toolbar");
+                       s_info.navi_it_con_list, "toolbar");
        SETTING_TRACE("elm_object_text_get(del_btn):%s",
                        elm_object_item_text_get(
                                        elm_toolbar_last_item_get(toolbar)));
@@ -316,7 +323,7 @@ static int _view_create(void *cb)
 
        /* [UI] Internet connection */
        /* [UI] MMS connection */
-       ad->navi_it_con_list = setting_push_to_naviframe_with_back_button(
+       s_info.navi_it_con_list = setting_push_to_naviframe_with_back_button(
                        _(title), NULL, __naviframe_item_pop_cb,
                        ad, scroller, ad->md.naviframe);
 
@@ -328,12 +335,12 @@ static int _view_create(void *cb)
        elm_object_style_set(btn, "naviframe/more/default");
        evas_object_smart_callback_add(btn, "clicked",
                        _create_ctxpopup_more_button_cb, ad);
-       elm_object_item_part_content_set(ad->navi_it_con_list,
+       elm_object_item_part_content_set(s_info.navi_it_con_list,
                        "toolbar_more_btn", btn);
 
-       ad->con_list_gl = scroller;
+       s_info.con_list_gl = scroller;
        /* TNEF-4143 */
-       elm_genlist_mode_set(ad->con_list_gl, ELM_LIST_COMPRESS);
+       elm_genlist_mode_set(s_info.con_list_gl, ELM_LIST_COMPRESS);
 
        __con_list_recreate(ad);
 
@@ -352,9 +359,9 @@ static int _view_destroy(void *cb)
        if (setting_view_network_con_list.is_create) {
                /*ad->connections_gl = NULL; */
                setting_view_network_con_list.is_create = 0;
-               ad->selected_profile = NULL;
-               ad->navi_it_con_list = NULL;
-               ad->con_list_gl = NULL;
+               s_info.selected_profile = NULL;
+               s_info.navi_it_con_list = NULL;
+               s_info.con_list_gl = NULL;
                elm_naviframe_item_pop(ad->md.naviframe);
        } else {
                SETTING_TRACE("why is this is_create == 0 ?? !!!");
@@ -423,7 +430,7 @@ static void ___network_con_set_default_cb(connection_error_e result, void *data)
 
        SETTING_TRACE("The result is :%d,but it is meaningless for our Setting",
                        result);
-       ad->selected_profile = list_item;
+       s_info.selected_profile = list_item;
        if (srvType == CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET
                        && ad->internet_conn) {
                G_FREE(ad->internet_conn->sub_desc);
@@ -434,7 +441,7 @@ static void ___network_con_set_default_cb(connection_error_e result, void *data)
                                ad->internet_conn);
                elm_genlist_item_update(ad->internet_conn->item);
        }
-       elm_genlist_realized_items_update(ad->con_list_gl);
+       elm_genlist_realized_items_update(s_info.con_list_gl);
 }
 #endif
 
@@ -453,7 +460,7 @@ static void __set_default_response_cb(void *data, Evas_Object *obj,
 
        /*SETTING_TRACE("The result is :%d,but it is meaningless for our Setting",
         * result); */
-       ad->selected_profile = list_item;
+       s_info.selected_profile = list_item;
        if (srvType == CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET
                        && ad->internet_conn) {
                G_FREE(ad->internet_conn->sub_desc);
@@ -464,7 +471,7 @@ static void __set_default_response_cb(void *data, Evas_Object *obj,
                                ad->internet_conn);
                elm_genlist_item_update(ad->internet_conn->item);
        }
-       elm_genlist_realized_items_update(ad->con_list_gl);
+       elm_genlist_realized_items_update(s_info.con_list_gl);
 
        evas_object_del(obj);
 }
@@ -545,9 +552,9 @@ static void __set_default_profile(Setting_GenGroupItem_Data *list_item)
                        if (ret != CONNECTION_ERROR_NONE) {
                                SETTING_TRACE_ERROR("Set profile error: %d",
                                                ret);
-                               if (ad->selected_profile)
+                               if (s_info.selected_profile)
                                        elm_radio_value_set(list_item->eo_check,
-                                                       ad->selected_profile->chk_status);
+                                                       s_info.selected_profile->chk_status);
 
                                setting_create_popup(list_item, ad->md.window,
                                                NULL, _("IDS_CST_POP_FAILED"),
index 38829faae98d04a288144af35d99680cdb13c5af..435f9ef6873f8bbfcf1d0e4a3cee2f21ba3f1b02 100644 (file)
@@ -27,6 +27,14 @@ static int setting_network_con_update(void *cb);
 static int setting_network_con_cleanup(void *cb);
 static Eina_Bool __naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
 
+static struct setting_network_con_info {
+       setting_view *profile_topper_view;
+       Evas_Object *popup_conreset;
+       Evas_Object *popup_conreset_complete;
+       Evas_Object *connections_gl; /* genlist in connections view */
+       Ecore_Idler *add_apn_timer;
+} s_info = {0,};
+
 setting_view setting_view_network_con = {
        .create = setting_network_con_create,
        .destroy = setting_network_con_destroy,
@@ -40,14 +48,14 @@ static void __setting_network_con_genlist_create(void *data)
        setting_retm_if(data == NULL, "data is NULL");
        SettingNetwork *ad = (SettingNetwork *)data;
 
-       elm_genlist_clear(ad->connections_gl); /* first to clear list */
+       elm_genlist_clear(s_info.connections_gl); /* first to clear list */
 
        /* [UI] Internet Connections */
        SETTING_TRACE("ad->internet_apn_name: %s, ad->MMS_apn_name: %s",
                        ad->internet_apn_name, ad->MMS_apn_name);
        ad->internet_apn_name = setting_network_get_default_profile_name(CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET, ad);
        Setting_GenGroupItem_Data *internet_conn = setting_create_Gendial_field_def(
-                       ad->connections_gl, &itc_2text_3,
+                       s_info.connections_gl, &itc_2text_3,
                        setting_network_con_item_Gendial_mouse_up_cb, ad,
                        SWALLOW_Type_INVALID, NULL, NULL, 0,
                        "IDS_ST_BODY_INTERNET_CONNECTION",
@@ -63,7 +71,7 @@ static void __setting_network_con_genlist_create(void *data)
        if (ad->MMS_apn_name) {
                /* [MMS Connections] Internet Connections */
                Setting_GenGroupItem_Data *mms_conn = setting_create_Gendial_field_def(
-                               ad->connections_gl, &itc_2text_3,
+                               s_info.connections_gl, &itc_2text_3,
                                setting_network_con_item_Gendial_mouse_up_cb,
                                ad, SWALLOW_Type_INVALID, NULL, NULL, 0,
                                STR_SETTING_MMS_CONNECTIONS, ad->MMS_apn_name,
@@ -71,7 +79,7 @@ static void __setting_network_con_genlist_create(void *data)
                ad->mms_conn = mms_conn;
        }
 #ifdef ENABLED_PREFERRED_NETWORKS
-       setting_create_Gendial_field_def(ad->connections_gl, &itc_1text,
+       setting_create_Gendial_field_def(s_info.connections_gl, &itc_1text,
                        setting_network_con_item_Gendial_mouse_up_cb,
                        ad, SWALLOW_Type_INVALID, NULL, NULL,
                        0, "IDS_ST_BODY_PREFERRED_NETWORKS",
@@ -79,7 +87,7 @@ static void __setting_network_con_genlist_create(void *data)
 #endif
 #ifdef ENABLED_2G3G_NETWORK
        /*      create 3g connection option */
-       setting_create_Gendial_field_def(ad->connections_gl, &itc_1text,
+       setting_create_Gendial_field_def(s_info.connections_gl, &itc_1text,
                        setting_network_con_item_Gendial_mouse_up_cb,
                        ad, SWALLOW_Type_INVALID, NULL, NULL,
                        0, "2G/3G Connection", NULL, NULL);
@@ -163,7 +171,7 @@ static void ctxpopup_item_select_cb(void *data, Evas_Object *obj,
        /* error check */
        retm_if(data == NULL, "Data parameter is NULL");
        SettingNetwork *ad = (SettingNetwork *)data;
-       ad->popup_conreset = setting_create_popup(ad, ad->md.window,
+       s_info.popup_conreset = setting_create_popup(ad, ad->md.window,
                        NULL, _("IDS_ST_POP_RESET_TO_DEFAULT_Q"),
                        setting_network_con_reset_popup_cb, 0, false, false, 2,
                        _("IDS_ST_BUTTON_OK"), _("IDS_ST_BUTTON_CANCEL_ABB"));
@@ -265,7 +273,7 @@ static int setting_network_con_create(void *cb)
                        "Cannot set genlist object as content of layout");
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_object_style_set(genlist, "dialogue");
-       ad->connections_gl = genlist;
+       s_info.connections_gl = genlist;
        evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb, NULL);
 
        Elm_Object_Item *navi_it = setting_push_to_naviframe_with_back_button(
@@ -298,11 +306,11 @@ static int setting_network_con_destroy(void *cb)
 
        SettingNetwork *ad = (SettingNetwork *)cb;
        /*FREE(ad->con_name); */
-       ad->connections_gl = NULL;
+       s_info.connections_gl = NULL;
        if (setting_view_network_con.is_create) {
-               if (ad->add_apn_timer) {
-                       ecore_idler_del(ad->add_apn_timer);
-                       ad->add_apn_timer = NULL;
+               if (s_info.add_apn_timer) {
+                       ecore_idler_del(s_info.add_apn_timer);
+                       s_info.add_apn_timer = NULL;
                }
 
                elm_naviframe_item_pop(ad->md.naviframe);
@@ -355,7 +363,7 @@ static void setting_network_con_item_Gendial_mouse_up_cb(void *data,
        setting_retm_if(NULL == list_item, "list_item is NULL");
 
        SettingNetwork *ad = (SettingNetwork *)data;
-       ad->profile_topper_view = NULL;
+       s_info.profile_topper_view = NULL;
 
        SETTING_TRACE("clicking item[%s]", _(list_item->keyStr));
 
@@ -441,7 +449,7 @@ static void setting_network_con_item_Gendial_mouse_up_cb(void *data,
        } else if (!safeStrCmp(STR_SETTING_MMS_CONNECTIONS,
                        list_item->keyStr)) {
                FREE(ad->con_name);
-               ad->profile_topper_view = &setting_view_network_con;
+               s_info.profile_topper_view = &setting_view_network_con;
                ad->con_name = strdup(STR_SETTING_MMS_CONNECTIONS);
                ad->access_name = strdup(STR_SETTING_MMS_CONNECTIONS);
                ad->profile_service_type = CONNECTION_CELLULAR_SERVICE_TYPE_MMS;
@@ -449,7 +457,7 @@ static void setting_network_con_item_Gendial_mouse_up_cb(void *data,
                                &setting_view_network_con_list, ad);
        } else {
                FREE(ad->con_name);
-               ad->profile_topper_view = &setting_view_network_con;
+               s_info.profile_topper_view = &setting_view_network_con;
                ad->con_name = strdup(list_item->sub_desc);
                ad->access_name = strdup(list_item->sub_desc);
                ad->profile_service_type = list_item->chk_status;
@@ -470,9 +478,9 @@ void _reset_do_default_cb(connection_error_e result, void *user_data)
                ad->network_popup = NULL;
        }
 
-       if (ad->popup_conreset_complete) {
-               evas_object_del(ad->popup_conreset_complete);
-               ad->popup_conreset_complete = NULL;
+       if (s_info.popup_conreset_complete) {
+               evas_object_del(s_info.popup_conreset_complete);
+               s_info.popup_conreset_complete = NULL;
        }
 
        if (result == CONNECTION_ERROR_NONE) {
@@ -499,14 +507,14 @@ static void setting_network_con_reset_popup_cb(void *data, Evas_Object *obj,
        SettingNetwork *ad = (SettingNetwork *)data;
 
        if (ad) {
-               evas_object_del(ad->popup_conreset);
-               ad->popup_conreset = NULL;
+               evas_object_del(s_info.popup_conreset);
+               s_info.popup_conreset = NULL;
        }
 
        if (response_type == POPUP_RESPONSE_OK) {
 
                /* waiting popup should be here */
-               ad->popup_conreset_complete = setting_create_popup_with_progressbar(
+               s_info.popup_conreset_complete = setting_create_popup_with_progressbar(
                                ad, ad->md.window,
                                PROGRESSBAR_STYLE, NULL, IDS_ST_SK2_PLEASE_WAIT,
                                NULL, 0, TRUE, TRUE, 0);
index 80499b11aff70bf78cf0f3541a064ecca09f027a..46514b443a7745b88df13f92441865d26d66358b 100644 (file)
@@ -44,6 +44,50 @@ static void _check_entry_empty(SettingNetwork *ad);
 static void _display_auth_type(SettingNetwork * ad, int auth_type);
 static void _hide_input_pannel(SettingNetwork *ad);
 
+static struct setting_network_connection_create_info {
+       connection_profile_h sel_profile_h;
+       Evas_Object *popup_auth_type;
+       Evas_Object *popup_pdn_type;
+       Elm_Object_Item *navi_it;
+       Evas_Object *con_create_gl;
+       Evas_Object *l_button;
+       Evas_Object *r_button;
+       bool has_form_changed;
+       Setting_GenGroupItem_Data *data_srv_type;
+       int is_show_user;
+       Evas_Object *chk_type;
+       Evas_Object *chk_type_pdn;
+       Evas_Object *chk_type_roam_pdn;
+       char *ed_profile_name_desc;
+       char *ed_acs_name_desc;
+       char *ed_auth_type_desc;
+       char *ed_user_name_desc;
+       char *ed_pwd_desc;
+       char *ed_pxy_addr_desc;
+       char *ed_pxy_port_desc;
+       char *ed_pdn_type_desc;
+       char *ed_roam_pdn_type_desc;
+       char *ed_hm_url_desc;
+       int chkType;
+       int chkType_pdn;
+       int chkType_roam_pdn;
+       int srvType;
+       bool is_editable;
+       Elm_Object_Item *item_above_user_name;
+       Elm_Object_Item *item_above_proxy_add;
+       Setting_GenGroupItem_Data *data_user_name;
+       Setting_GenGroupItem_Data *data_pwd;
+       Setting_GenGroupItem_Data *data_acs_name;
+       Setting_GenGroupItem_Data *data_profile_name;
+       Setting_GenGroupItem_Data *data_pxy_addr;
+       Setting_GenGroupItem_Data *data_pxy_port;
+       Setting_GenGroupItem_Data *data_pdn_type;
+       Setting_GenGroupItem_Data *data_roam_pdn_type;
+       Setting_GenGroupItem_Data *data_hm_url;
+       Setting_GenGroupItem_Data *data_auth_type;
+       Evas_Object *scl_edit;
+} s_info = {0,};
+
 setting_view setting_network_connection_create_view = {
                .create = _view_create,
                .destroy = _view_destroy,
@@ -57,21 +101,24 @@ setting_view setting_network_connection_create_view = {
  *
  ***************************************************/
 
+void setting_network_connection_create_terminate(void)
+{
+       G_FREE(s_info.ed_pxy_addr_desc);
+       G_FREE(s_info.ed_pxy_port_desc);
+}
+
 static void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        retm_if(data == NULL, "Data parameter is NULL");
-       Setting_GenGroupItem_Data *list_item =
-                       (Setting_GenGroupItem_Data *)data;
+       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *)data;
        list_item->chk_status = elm_radio_value_get(obj); /* for update */
 
        Elm_Object_Item *subItem = list_item->item;
        Elm_Object_Item *parentItem = elm_genlist_item_parent_get(subItem);
 
-       Setting_GenGroupItem_Data *data_subItem = elm_object_item_data_get(
-                       subItem); /* subItem data */
-       Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(
-                       parentItem); /* parent data */
+       Setting_GenGroupItem_Data *data_subItem = elm_object_item_data_get(subItem); /* subItem data */
+       Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem); /* parent data */
 
        ret_if(NULL == data_subItem || NULL == data_parentItem);
 
@@ -81,49 +128,47 @@ static void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
 
        SettingNetwork *ad = data_parentItem->userdata;
 
-       if (data_parentItem == ad->data_auth_type) {
-               elm_genlist_item_expanded_set(ad->data_auth_type->item, FALSE);
-               elm_genlist_item_update(ad->data_auth_type->item);
-
-               _display_auth_type(
-                               data_parentItem->userdata,
-                               list_item->chk_status);
-       } else if (data_parentItem == ad->data_srv_type) {
-               if (ad->srvType != data_subItem->chk_status)
-                       ad->srvType = data_subItem->chk_status;
-               if (ad->srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
-                       if (!ad->data_hm_url) {
+       if (data_parentItem == s_info.data_hm_url) {
+               elm_genlist_item_expanded_set(s_info.data_hm_url->item, FALSE);
+               elm_genlist_item_update(s_info.data_hm_url->item);
+
+               _display_auth_type(data_parentItem->userdata, list_item->chk_status);
+       } else if (data_parentItem == s_info.data_srv_type) {
+               if (s_info.srvType != data_subItem->chk_status)
+                       s_info.srvType = data_subItem->chk_status;
+               if (s_info.srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
+                       if (!s_info.data_hm_url) {
                                /* need home url */
-                               ad->data_hm_url = setting_create_Gendial_field_def(
+                               s_info.data_hm_url = setting_create_Gendial_field_def(
                                                obj, &itc_editfield,
                                                NULL, NULL,
                                                SWALLOW_Type_LAYOUT_EDITFIELD,
                                                NULL, NULL, 0,
                                                "IDS_ST_BODY_HOME_URL",
-                                               (char *)ad->ed_hm_url_desc,
+                                               (char *)s_info.ed_hm_url_desc,
                                                _entry_changed_cb);
-                               if (ad->data_hm_url) {
-                                       ad->data_hm_url->userdata = ad;
-                                       ad->data_hm_url->input_type = ELM_INPUT_PANEL_LAYOUT_URL;
-                                       ad->data_hm_url->isSinglelineFlag = TRUE;
-                                       ad->data_hm_url->limit_filter_data = calloc(
+                               if (s_info.data_hm_url) {
+                                       s_info.data_hm_url->userdata = ad;
+                                       s_info.data_hm_url->input_type = ELM_INPUT_PANEL_LAYOUT_URL;
+                                       s_info.data_hm_url->isSinglelineFlag = TRUE;
+                                       s_info.data_hm_url->limit_filter_data = calloc(
                                                        1,
                                                        sizeof(Elm_Entry_Filter_Accept_Set));
-                                       if (ad->data_hm_url->limit_filter_data) {
-                                               ad->data_hm_url->limit_filter_data->max_byte_count = MAX_HOME_URL_LEN_MAX
+                                       if (s_info.data_hm_url->limit_filter_data) {
+                                               s_info.data_hm_url->limit_filter_data->max_byte_count = MAX_HOME_URL_LEN_MAX
                                                                - 1;
-                                               ad->data_hm_url->window = ad->md.window;
+                                               s_info.data_hm_url->window = ad->md.window;
                                        }
                                } else {
                                        SETTING_TRACE_ERROR(
-                                                       "ad->data_hm_url is NULL");
+                                                       "s_info.data_hm_url is NULL");
                                }
                        }
                } else {
                        /* do need home-url */
-                       if (ad->data_hm_url) {
-                               elm_object_item_del(ad->data_hm_url->item);
-                               ad->data_hm_url = NULL;
+                       if (s_info.data_hm_url) {
+                               elm_object_item_del(s_info.data_hm_url->item);
+                               s_info.data_hm_url = NULL;
                        }
                }
        }
@@ -134,19 +179,19 @@ static void _create_new_cellular_internet_profile(SettingNetwork *ad)
        int ret;
        const char *profile_name = NULL;
 
-       if (ad->data_profile_name)
+       if (s_info.data_profile_name)
                profile_name = elm_entry_markup_to_utf8(
-                               ad->data_profile_name->sub_desc);
+                               s_info.data_profile_name->sub_desc);
        if (!profile_name)
                profile_name = strdup("");
 
        ret = connection_profile_create(
                        CONNECTION_PROFILE_TYPE_CELLULAR,
-                       _(profile_name), &ad->sel_profile_h);
+                       _(profile_name), &s_info.sel_profile_h);
 
        if (ret == CONNECTION_ERROR_NONE)
                ret = connection_profile_set_cellular_service_type(
-                               ad->sel_profile_h,
+                               s_info.sel_profile_h,
                                CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET);
 
        if (ret != CONNECTION_ERROR_NONE)
@@ -181,122 +226,110 @@ static void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
        data_parentItem->sub_desc = (char *)g_strdup(_(data_subItem->keyStr));
        elm_object_item_data_set(data_parentItem->item, data_parentItem);
 
-       if (data_parentItem == ad->data_auth_type) {
-               elm_genlist_item_expanded_set(ad->data_auth_type->item, FALSE);
-               elm_genlist_item_update(ad->data_auth_type->item);
+       if (data_parentItem == s_info.data_hm_url) {
+               elm_genlist_item_expanded_set(s_info.data_hm_url->item, FALSE);
+               elm_genlist_item_update(s_info.data_hm_url->item);
 
                _display_auth_type(ad, chk_status);
 
                /* remove network mode popup */
-               if (ad->popup_auth_type) {
-                       evas_object_del(ad->popup_auth_type);
-                       ad->popup_auth_type = NULL;
+               if (s_info.popup_auth_type) {
+                       evas_object_del(s_info.popup_auth_type);
+                       s_info.popup_auth_type = NULL;
                }
 
-       } else if (data_parentItem == ad->data_srv_type) {
-               if (ad->srvType != data_subItem->chk_status)
-                       ad->srvType = data_subItem->chk_status;
-               if (ad->srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
-                       if (!ad->data_hm_url) {
+       } else if (data_parentItem == s_info.data_srv_type) {
+               if (s_info.srvType != data_subItem->chk_status)
+                       s_info.srvType = data_subItem->chk_status;
+               if (s_info.srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
+                       if (!s_info.data_hm_url) {
                                /* need home url */
-                               ad->data_hm_url = setting_create_Gendial_field_def(
+                               s_info.data_hm_url = setting_create_Gendial_field_def(
                                                obj, &itc_editfield,
                                                NULL, NULL,
                                                SWALLOW_Type_LAYOUT_EDITFIELD,
                                                NULL, NULL, 0,
                                                "IDS_ST_BODY_HOME_URL",
-                                               (char *)ad->ed_hm_url_desc,
+                                               (char *)s_info.ed_hm_url_desc,
                                                _entry_changed_cb);
-                               if (ad->data_hm_url) {
-                                       ad->data_hm_url->userdata = ad;
-                                       ad->data_hm_url->input_type = ELM_INPUT_PANEL_LAYOUT_URL;
-                                       ad->data_hm_url->limit_filter_data = calloc(
+                               if (s_info.data_hm_url) {
+                                       s_info.data_hm_url->userdata = ad;
+                                       s_info.data_hm_url->input_type = ELM_INPUT_PANEL_LAYOUT_URL;
+                                       s_info.data_hm_url->limit_filter_data = calloc(
                                                        1,
                                                        sizeof(Elm_Entry_Filter_Accept_Set));
-                                       if (ad->data_hm_url->limit_filter_data) {
-                                               ad->data_hm_url->limit_filter_data->max_byte_count = MAX_HOME_URL_LEN_MAX
+                                       if (s_info.data_hm_url->limit_filter_data) {
+                                               s_info.data_hm_url->limit_filter_data->max_byte_count = MAX_HOME_URL_LEN_MAX
                                                                - 1;
-                                               ad->data_hm_url->window = ad->md.window;
+                                               s_info.data_hm_url->window = ad->md.window;
                                        }
                                } else {
                                        SETTING_TRACE_ERROR(
-                                                       "ad->data_hm_url is NULL");
+                                                       "s_info.data_hm_url is NULL");
                                }
                        }
                } else {
                        /* do need home-url */
-                       if (ad->data_hm_url) {
-                               elm_object_item_del(ad->data_hm_url->item);
-                               ad->data_hm_url = NULL;
+                       if (s_info.data_hm_url) {
+                               elm_object_item_del(s_info.data_hm_url->item);
+                               s_info.data_hm_url = NULL;
                        }
                }
 
-       } else if (data_parentItem == ad->data_pdn_type) {
-               elm_genlist_item_expanded_set(ad->data_pdn_type->item, FALSE);
-               elm_genlist_item_update(ad->data_pdn_type->item);
+       } else if (data_parentItem == s_info.data_pdn_type) {
+               elm_genlist_item_expanded_set(s_info.data_pdn_type->item, FALSE);
+               elm_genlist_item_update(s_info.data_pdn_type->item);
 
-               if (!ad->sel_profile_h)
+               if (!s_info.sel_profile_h)
                        _create_new_cellular_internet_profile(ad);
 
-               ret = connection_profile_set_cellular_pdn_type(
-                               ad->sel_profile_h,
-                               chk_status);
+               ret = connection_profile_set_cellular_pdn_type(s_info.sel_profile_h, chk_status);
                if (ret != CONNECTION_ERROR_NONE) {
-                       SETTING_TRACE_ERROR("Fail to set cellular pdn type!"
-                                       " Error code (%d): %s",
-                                       ret, get_error_message(ret));
+                       SETTING_TRACE_ERROR("Fail to set cellular pdn type! Error code (%d): %s", ret, get_error_message(ret));
                } else {
-                       ad->chkType_pdn = chk_status;
-                       connection_update_profile(ad->connection,
-                                       ad->sel_profile_h);
+                       s_info.chkType_pdn = chk_status;
+                       connection_update_profile(ad->connection, s_info.sel_profile_h);
                }
 
                /* remove network mode popup */
-               if (ad->popup_pdn_type) {
-                       evas_object_del(ad->popup_pdn_type);
-                       ad->popup_pdn_type = NULL;
+               if (s_info.popup_pdn_type) {
+                       evas_object_del(s_info.popup_pdn_type);
+                       s_info.popup_pdn_type = NULL;
                }
 
-       } else if (data_parentItem == ad->data_roam_pdn_type) {
-               elm_genlist_item_expanded_set(ad->data_roam_pdn_type->item,
-                               FALSE);
-               elm_genlist_item_update(ad->data_roam_pdn_type->item);
+       } else if (data_parentItem == s_info.data_roam_pdn_type) {
+               elm_genlist_item_expanded_set(s_info.data_roam_pdn_type->item, FALSE);
+               elm_genlist_item_update(s_info.data_roam_pdn_type->item);
 
-               if (!ad->sel_profile_h)
+               if (!s_info.sel_profile_h)
                        _create_new_cellular_internet_profile(ad);
 
-               ret = connection_profile_set_cellular_roam_pdn_type(
-                               ad->sel_profile_h,
-                               chk_status);
+               ret = connection_profile_set_cellular_roam_pdn_type(s_info.sel_profile_h, chk_status);
                if (ret != CONNECTION_ERROR_NONE) {
-                       SETTING_TRACE_ERROR("Fail to set cellular roam pdn "
-                                       "type: %s", get_error_message(ret));
+                       SETTING_TRACE_ERROR("Fail to set cellular roam pdn type: %s", get_error_message(ret));
                } else {
-                       ad->chkType_roam_pdn = chk_status;
-                       connection_update_profile(ad->connection,
-                                       ad->sel_profile_h);
+                       s_info.chkType_roam_pdn = chk_status;
+                       connection_update_profile(ad->connection, s_info.sel_profile_h);
                }
 
                /* remove network mode popup */
-               if (ad->popup_pdn_type) {
-                       evas_object_del(ad->popup_pdn_type);
-                       ad->popup_pdn_type = NULL;
+               if (s_info.popup_pdn_type) {
+                       evas_object_del(s_info.popup_pdn_type);
+                       s_info.popup_pdn_type = NULL;
                }
        }
 }
 
 static void __popup_del(void *data, Evas_Object *obj, void *event_info)
 {
-       SettingNetwork *ad = data;
-
        ret_if(data == NULL);
 
-       if (ad->popup_auth_type) {
-               evas_object_del(ad->popup_auth_type);
-               ad->popup_auth_type = NULL;
-       } else if (ad->popup_pdn_type) {
-               evas_object_del(ad->popup_pdn_type);
-               ad->popup_auth_type = NULL;
+       if (s_info.popup_auth_type) {
+               evas_object_del(s_info.popup_auth_type);
+               s_info.popup_auth_type = NULL;
+       } else if (s_info.popup_pdn_type) {
+               evas_object_del(s_info.popup_pdn_type);
+               s_info.popup_auth_type = NULL;
        }
 }
 
@@ -312,19 +345,19 @@ static void __create_auth_type_popup(void *data, Evas_Object *obj,
                        parentItem); /* parent data */
 
        /* create popup */
-       if (ad->popup_auth_type) {
-               evas_object_del(ad->popup_auth_type);
-               ad->popup_auth_type = NULL;
+       if (s_info.popup_auth_type) {
+               evas_object_del(s_info.popup_auth_type);
+               s_info.popup_auth_type = NULL;
        }
        Evas_Object *scroller = NULL;
-       ad->popup_auth_type = setting_create_popup_with_list(&scroller, ad,
+       s_info.popup_auth_type = setting_create_popup_with_list(&scroller, ad,
                        ad->md.window, data_parentItem->keyStr, __popup_del, 0,
                        false, false, 0);
-       _P(ad->popup_auth_type);
+       _P(s_info.popup_auth_type);
 
        Evas_Object *rgd;
 
-       if (data_parentItem == ad->data_auth_type) {
+       if (data_parentItem == s_info.data_hm_url) {
                rgd = elm_radio_add(scroller);
                elm_radio_value_set(rgd, -1);
 
@@ -349,9 +382,9 @@ static void __create_auth_type_popup(void *data, Evas_Object *obj,
                                "IDS_ST_BODY_NONE",
                                NULL);
 
-               elm_radio_value_set(rgd, ad->chkType);
+               elm_radio_value_set(rgd, s_info.chkType);
                elm_object_signal_emit(rgd, "elm,event,pass,enabled", "elm");
-       } else if (data_parentItem == ad->data_srv_type) {
+       } else if (data_parentItem == s_info.data_srv_type) {
                rgd = elm_radio_add(scroller);
                elm_radio_value_set(rgd, -1);
 
@@ -382,7 +415,7 @@ static void __create_auth_type_popup(void *data, Evas_Object *obj,
                                CONNECTION_CELLULAR_SERVICE_TYPE_APPLICATION,
                                tmp_str, __sub_list_rd_change);
 
-               elm_radio_value_set(rgd, ad->srvType);
+               elm_radio_value_set(rgd, s_info.srvType);
                elm_object_signal_emit(rgd, "elm,event,pass,enabled", "elm");
        }
 }
@@ -400,19 +433,19 @@ static void __create_pdn_type_popup(void *data, Evas_Object *obj,
        ret_if(NULL == data_parentItem);
 
        /* create popup */
-       if (ad->popup_pdn_type) {
-               evas_object_del(ad->popup_pdn_type);
-               ad->popup_pdn_type = NULL;
+       if (s_info.popup_pdn_type) {
+               evas_object_del(s_info.popup_pdn_type);
+               s_info.popup_pdn_type = NULL;
        }
        Evas_Object *scroller = NULL;
-       ad->popup_pdn_type = setting_create_popup_with_list(&scroller, ad,
+       s_info.popup_pdn_type = setting_create_popup_with_list(&scroller, ad,
                        ad->md.window, data_parentItem->keyStr, __popup_del, 0,
                        false, false, 0);
-       _P(ad->popup_pdn_type);
+       _P(s_info.popup_pdn_type);
 
        Evas_Object *rgd;
 
-       if (data_parentItem == ad->data_pdn_type) {
+       if (data_parentItem == s_info.data_pdn_type) {
                rgd = elm_radio_add(scroller);
                elm_radio_value_set(rgd, -1);
 
@@ -446,9 +479,9 @@ static void __create_pdn_type_popup(void *data, Evas_Object *obj,
                                "IPv6",
                                NULL);
 
-               elm_radio_value_set(rgd, ad->chkType_pdn);
+               elm_radio_value_set(rgd, s_info.chkType_pdn);
                elm_object_signal_emit(rgd, "elm,event,pass,enabled", "elm");
-       } else if (data_parentItem == ad->data_roam_pdn_type) {
+       } else if (data_parentItem == s_info.data_roam_pdn_type) {
                rgd = elm_radio_add(scroller);
                elm_radio_value_set(rgd, -1);
 
@@ -471,7 +504,7 @@ static void __create_pdn_type_popup(void *data, Evas_Object *obj,
                                CONNECTION_CELLULAR_PDN_TYPE_IPV6, "IPv6",
                                NULL);
 
-               elm_radio_value_set(rgd, ad->chkType_roam_pdn);
+               elm_radio_value_set(rgd, s_info.chkType_roam_pdn);
                elm_object_signal_emit(rgd, "elm,event,pass,enabled", "elm");
 
        }
@@ -490,7 +523,7 @@ static void __setting_network_connection_exp_cb(void *data, Evas_Object *obj,
 
        Evas_Object *rgd;
 
-       if (data_parentItem == ad->data_auth_type) {
+       if (data_parentItem == s_info.data_hm_url) {
                rgd = elm_radio_add(scroller);
                /* elm_object_style_set(rgd, "list"); */
                elm_radio_value_set(rgd, -1);
@@ -521,11 +554,11 @@ static void __setting_network_connection_exp_cb(void *data, Evas_Object *obj,
                                IDS_ST_POP_CHAP, __sub_list_rd_change);
 
                SETTING_TRACE(
-                               " ---------------------->>> ad->chkType : %d ",
-                               ad->chkType);
+                               " ---------------------->>> s_info.chkType : %d ",
+                               s_info.chkType);
 
-               elm_radio_value_set(rgd, ad->chkType);
-       } else if (data_parentItem == ad->data_srv_type) {
+               elm_radio_value_set(rgd, s_info.chkType);
+       } else if (data_parentItem == s_info.data_srv_type) {
                rgd = elm_radio_add(scroller);
                elm_radio_value_set(rgd, -1);
 
@@ -556,7 +589,7 @@ static void __setting_network_connection_exp_cb(void *data, Evas_Object *obj,
                                CONNECTION_CELLULAR_SERVICE_TYPE_APPLICATION,
                                tmp_str, __sub_list_rd_change);
 
-               elm_radio_value_set(rgd, ad->srvType);
+               elm_radio_value_set(rgd, s_info.srvType);
        }
 }
 
@@ -565,7 +598,6 @@ static Eina_Bool __connection_idler(void *data)
        SETTING_TRACE_BEGIN;
        retv_if(!data, FALSE);
        SettingNetwork *ad = data;
-       /* __genlist_disable_set(ad->scl_edit, TRUE); */
        _hide_input_pannel(ad);
        return FALSE;
 }
@@ -595,19 +627,19 @@ static void __get_connection_info(void *cb)
        SettingNetwork *ad = (SettingNetwork *)cb;
        ret_if(!ad);
 
-       G_FREE(ad->ed_profile_name_desc);
-       G_FREE(ad->ed_acs_name_desc);
-       G_FREE(ad->ed_user_name_desc);
-       G_FREE(ad->ed_pwd_desc);
-       G_FREE(ad->ed_pxy_addr_desc);
-       G_FREE(ad->ed_pxy_port_desc);
-       G_FREE(ad->ed_hm_url_desc);
+       G_FREE(s_info.ed_profile_name_desc);
+       G_FREE(s_info.ed_acs_name_desc);
+       G_FREE(s_info.ed_user_name_desc);
+       G_FREE(s_info.ed_pwd_desc);
+       G_FREE(s_info.ed_pxy_addr_desc);
+       G_FREE(s_info.ed_pxy_port_desc);
+       G_FREE(s_info.ed_hm_url_desc);
 
-       ad->ed_auth_type_desc = NULL;
-       ad->ed_pdn_type_desc = NULL;
-       ad->ed_roam_pdn_type_desc = NULL;
-       ad->chkType = CONNECTION_CELLULAR_AUTH_TYPE_NONE;
-       ad->chkType_pdn = CONNECTION_CELLULAR_PDN_TYPE_UNKNOWN;
+       s_info.ed_auth_type_desc = NULL;
+       s_info.ed_pdn_type_desc = NULL;
+       s_info.ed_roam_pdn_type_desc = NULL;
+       s_info.chkType = CONNECTION_CELLULAR_AUTH_TYPE_NONE;
+       s_info.chkType_pdn = CONNECTION_CELLULAR_PDN_TYPE_UNKNOWN;
 
        SETTING_TRACE("ad->con_name:%s, ad->profile_service_type:%d",
                        ad->con_name, ad->profile_service_type);
@@ -659,7 +691,7 @@ static void __get_connection_info(void *cb)
                /* match with ServiceType */
                if (selected_service_type == service_type
                                && safeStrCmp(con_name_utf8, profile_id) == 0) {
-                       ad->sel_profile_h = profile_h;
+                       s_info.sel_profile_h = profile_h;
                        found = TRUE;
                        break;
                }
@@ -667,7 +699,7 @@ static void __get_connection_info(void *cb)
                cnt++;
        }
        FREE(con_name_utf8);
-       ad->is_editable = TRUE;
+       s_info.is_editable = TRUE;
        if (found) { /* found sucessfully */
                SETTING_TRACE("found the following record:");
                SETTING_TRACE("\tapn:%s", apn);
@@ -675,45 +707,45 @@ static void __get_connection_info(void *cb)
                SETTING_TRACE("\tprofile_name:%s", profile_name);
                SETTING_TRACE("\tservice_type:%d", service_type);
                SETTING_TRACE("\tprofile_type:%d", profile_type);
-               ad->srvType = service_type;
-               ad->ed_profile_name_desc = profile_name;
+               s_info.srvType = service_type;
+               s_info.ed_profile_name_desc = profile_name;
 
-               connection_profile_is_cellular_editable(ad->sel_profile_h,
-                               &(ad->is_editable));
-               SETTING_TRACE("ad->is_editable:%d", ad->is_editable);
+               connection_profile_is_cellular_editable(s_info.sel_profile_h,
+                               &(s_info.is_editable));
+               SETTING_TRACE("s_info.is_editable:%d", s_info.is_editable);
 
                /* load access name */
-               connection_profile_get_cellular_apn(ad->sel_profile_h,
-                               &(ad->ed_acs_name_desc));
+               connection_profile_get_cellular_apn(s_info.sel_profile_h,
+                               &(s_info.ed_acs_name_desc));
                connection_cellular_auth_type_e auth_type =
                                CONNECTION_CELLULAR_AUTH_TYPE_NONE;
-               connection_profile_get_cellular_auth_info(ad->sel_profile_h,
-                               &auth_type, &(ad->ed_user_name_desc),
-                               &(ad->ed_pwd_desc));
+               connection_profile_get_cellular_auth_info(s_info.sel_profile_h,
+                               &auth_type, &(s_info.ed_user_name_desc),
+                               &(s_info.ed_pwd_desc));
                SETTING_TRACE(" ----> auth_type: (%d)", auth_type);
 
-               ad->chkType = auth_type;
+               s_info.chkType = auth_type;
                /*SETTING_TRACE("-----> radio button state: %d",
-                * elm_radio_value_get(ad->chk_type));*/
+                * elm_radio_value_get(s_info.chk_type));*/
                SETTING_TRACE(
                                "-------------> connection_profile_get_cellular"
                                "_auth_info: %d",
                                auth_type);
-               elm_radio_value_set(ad->chk_type, ad->chkType);
+               elm_radio_value_set(s_info.chk_type, s_info.chkType);
 
-               switch (ad->chkType) {
+               switch (s_info.chkType) {
                case CONNECTION_CELLULAR_AUTH_TYPE_NONE:
-                       ad->ed_auth_type_desc = _("IDS_ST_BODY_NONE");
+                       s_info.ed_auth_type_desc = _("IDS_ST_BODY_NONE");
                        break;
                case CONNECTION_CELLULAR_AUTH_TYPE_PAP:
-                       ad->ed_auth_type_desc = _("IDS_ST_MBODY_PAP");
+                       s_info.ed_auth_type_desc = _("IDS_ST_MBODY_PAP");
                        break;
                case CONNECTION_CELLULAR_AUTH_TYPE_CHAP:
-                       ad->ed_auth_type_desc = _("IDS_ST_POP_CHAP");
+                       s_info.ed_auth_type_desc = _("IDS_ST_POP_CHAP");
                        break;
                default:
-                       ad->chkType = CONNECTION_CELLULAR_AUTH_TYPE_NONE;
-                       ad->ed_auth_type_desc = _("IDS_ST_BODY_NONE");
+                       s_info.chkType = CONNECTION_CELLULAR_AUTH_TYPE_NONE;
+                       s_info.ed_auth_type_desc = _("IDS_ST_BODY_NONE");
                        break;
                }
 
@@ -721,26 +753,26 @@ static void __get_connection_info(void *cb)
                connection_cellular_pdn_type_e pdn_type;
                if (CONNECTION_ERROR_NONE
                                != connection_profile_get_cellular_pdn_type(
-                                               ad->sel_profile_h, &pdn_type)) {
+                                               s_info.sel_profile_h, &pdn_type)) {
                        SETTING_TRACE_ERROR("Fail to get cellular pdn type!\n");
                } else {
-                       ad->chkType_pdn = pdn_type;
+                       s_info.chkType_pdn = pdn_type;
                        SETTING_TRACE("Cellular pdn type : %d\n", pdn_type);
-                       elm_radio_value_set(ad->chk_type_pdn, ad->chkType_pdn);
+                       elm_radio_value_set(s_info.chk_type_pdn, s_info.chkType_pdn);
 
-                       switch (ad->chkType_pdn) {
+                       switch (s_info.chkType_pdn) {
                        case CONNECTION_CELLULAR_PDN_TYPE_IPV4:
-                               ad->ed_pdn_type_desc = _("IPv4");
+                               s_info.ed_pdn_type_desc = _("IPv4");
                                break;
                        case CONNECTION_CELLULAR_PDN_TYPE_IPV6:
-                               ad->ed_pdn_type_desc = _("IPv6");
+                               s_info.ed_pdn_type_desc = _("IPv6");
                                break;
                        case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPv6:
-                               ad->ed_pdn_type_desc = _("IPv4v6");
+                               s_info.ed_pdn_type_desc = _("IPv4v6");
                                break;
                        default:
-                               ad->chkType_pdn = CONNECTION_CELLULAR_PDN_TYPE_UNKNOWN;
-                               ad->ed_pdn_type_desc = _("Unknown");
+                               s_info.chkType_pdn = CONNECTION_CELLULAR_PDN_TYPE_UNKNOWN;
+                               s_info.ed_pdn_type_desc = _("Unknown");
                        }
                }
 
@@ -748,36 +780,36 @@ static void __get_connection_info(void *cb)
                connection_cellular_pdn_type_e roam_pdn_type;
                if (CONNECTION_ERROR_NONE
                                != connection_profile_get_cellular_roam_pdn_type(
-                                               ad->sel_profile_h,
+                                               s_info.sel_profile_h,
                                                &roam_pdn_type)) {
                        SETTING_TRACE_ERROR("Fail to get cellular pdn type!\n");
                } else {
-                       ad->chkType_roam_pdn = roam_pdn_type;
+                       s_info.chkType_roam_pdn = roam_pdn_type;
                        SETTING_TRACE("Cellular roam pdn type : %d\n",
                                        roam_pdn_type);
-                       elm_radio_value_set(ad->chk_type_roam_pdn,
-                                       ad->chkType_roam_pdn);
+                       elm_radio_value_set(s_info.chk_type_roam_pdn,
+                                       s_info.chkType_roam_pdn);
 
-                       switch (ad->chkType_roam_pdn) {
+                       switch (s_info.chkType_roam_pdn) {
                        case CONNECTION_CELLULAR_PDN_TYPE_IPV4:
-                               ad->ed_roam_pdn_type_desc = _("IPv4");
+                               s_info.ed_roam_pdn_type_desc = _("IPv4");
                                break;
                        case CONNECTION_CELLULAR_PDN_TYPE_IPV6:
-                               ad->ed_roam_pdn_type_desc = _("IPv6");
+                               s_info.ed_roam_pdn_type_desc = _("IPv6");
                                break;
                        case CONNECTION_CELLULAR_PDN_TYPE_IPV4_IPv6:
-                               ad->ed_roam_pdn_type_desc = _("IPv4v6");
+                               s_info.ed_roam_pdn_type_desc = _("IPv4v6");
                                break;
                        default:
-                               ad->chkType_roam_pdn =
+                               s_info.chkType_roam_pdn =
                                                CONNECTION_CELLULAR_PDN_TYPE_UNKNOWN;
-                               ad->ed_roam_pdn_type_desc = _("Unknown");
+                               s_info.ed_roam_pdn_type_desc = _("Unknown");
                        }
                }
 
                /* Fix the Port 'NULL' issue when enter connection view
                 * repeatly.. */
-               connection_profile_get_proxy_address(ad->sel_profile_h,
+               connection_profile_get_proxy_address(s_info.sel_profile_h,
                                CONNECTION_ADDRESS_FAMILY_IPV4, &full_addr);
                SETTING_TRACE("full_addr: %s", full_addr);
                safeCopyStr(ProxyAddr, full_addr, MAX_HOME_URL_LEN_MAX);
@@ -798,31 +830,31 @@ static void __get_connection_info(void *cb)
                        addr = strsep(&addr, "/");
                }
 
-               ad->ed_pxy_addr_desc = NULL;
+               s_info.ed_pxy_addr_desc = NULL;
                /* proxy address support not only ip but also url, need not
                 * check the format */
                if (!isEmptyStr(addr)) {
-                       ad->ed_pxy_addr_desc = g_strdup(addr);
+                       s_info.ed_pxy_addr_desc = g_strdup(addr);
                        port = strsep(&full_addr, "/");
                } else { /* invalid format,let addr and port to be NULL. */
                        addr = NULL;
                }
                SETTING_TRACE("addr:%s", addr);
                SETTING_TRACE("port:%s", port);
-               SETTING_TRACE("ad->ed_pxy_addr_desc:%s", ad->ed_pxy_addr_desc);
-               ad->ed_pxy_port_desc = g_strdup(port);
+               SETTING_TRACE("s_info.ed_pxy_addr_desc:%s", s_info.ed_pxy_addr_desc);
+               s_info.ed_pxy_port_desc = g_strdup(port);
                /* Message Connection */
                if (!safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS))
                        connection_profile_get_cellular_home_url(
-                                       ad->sel_profile_h,
-                                       &(ad->ed_hm_url_desc));
+                                       s_info.sel_profile_h,
+                                       &(s_info.ed_hm_url_desc));
 
        } else {
                SETTING_TRACE("Didn't find any record, to let add a new one:");
-               ad->sel_profile_h = NULL;
-               ad->ed_auth_type_desc = _("IDS_ST_BODY_NONE");
-               ad->chkType = CONNECTION_CELLULAR_AUTH_TYPE_NONE;
-               ad->srvType = CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET;
+               s_info.sel_profile_h = NULL;
+               s_info.ed_auth_type_desc = _("IDS_ST_BODY_NONE");
+               s_info.chkType = CONNECTION_CELLULAR_AUTH_TYPE_NONE;
+               s_info.srvType = CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET;
        }
 
        /* release the memory.. */
@@ -863,32 +895,30 @@ static void _entry_next_activated_cb(void *data,
        SETTING_TRACE_BEGIN;
        retm_if(data == NULL, "Data parameter is NULL");
 
-       Setting_GenGroupItem_Data *list_item =
-                       (Setting_GenGroupItem_Data *)data;
-       SettingNetwork *ad = list_item->userdata;
+       Setting_GenGroupItem_Data *list_item = (Setting_GenGroupItem_Data *)data;
 
        Evas_Object *pObj_NextEntry = NULL;
 
-       if (list_item == ad->data_profile_name) {
+       if (list_item == s_info.data_profile_name) {
                /* Profile name -> Access name */
-               if (ad->data_acs_name)
-                       pObj_NextEntry = ad->data_acs_name->eo_check;
-       } else if (list_item == ad->data_user_name) {
+               if (s_info.data_acs_name)
+                       pObj_NextEntry = s_info.data_acs_name->eo_check;
+       } else if (list_item == s_info.data_user_name) {
                /* User name -> Password */
-               if (ad->data_pwd)
-                       pObj_NextEntry = ad->data_pwd->eo_check;
-       } else if (list_item == ad->data_pwd) {
+               if (s_info.data_pwd)
+                       pObj_NextEntry = s_info.data_pwd->eo_check;
+       } else if (list_item == s_info.data_pwd) {
                /* Password -> Proxy address */
-               if (ad->data_pxy_addr)
-                       pObj_NextEntry = ad->data_pxy_addr->eo_check;
-       } else if (list_item == ad->data_pxy_addr) {
+               if (s_info.data_pxy_addr)
+                       pObj_NextEntry = s_info.data_pxy_addr->eo_check;
+       } else if (list_item == s_info.data_pxy_addr) {
                /* Proxy address -> Proxy port */
-               if (ad->data_pxy_port)
-                       pObj_NextEntry = ad->data_pxy_port->eo_check;
-       } else if (list_item == ad->data_pxy_port) {
+               if (s_info.data_pxy_port)
+                       pObj_NextEntry = s_info.data_pxy_port->eo_check;
+       } else if (list_item == s_info.data_pxy_port) {
                /* Proxy port -> Home URL */
-               if (ad->data_hm_url)
-                       pObj_NextEntry = ad->data_hm_url->eo_check;
+               if (s_info.data_hm_url)
+                       pObj_NextEntry = s_info.data_hm_url->eo_check;
        } else {
                SETTING_TRACE_ERROR("list_item unknown");
                return;
@@ -911,17 +941,15 @@ static void _init_context(void *cb)
        SETTING_TRACE_BEGIN;
        ret_if(cb == NULL);
 
-       SettingNetwork *ad = (SettingNetwork *)cb;
-
        /* connection intializes */
-       ad->data_profile_name = NULL;
-       ad->data_acs_name = NULL;
-       ad->data_auth_type = NULL;
-       ad->data_user_name = NULL;
-       ad->data_pwd = NULL;
-       ad->data_pxy_addr = NULL;
-       ad->data_pxy_port = NULL;
-       ad->data_hm_url = NULL;
+       s_info.data_profile_name = NULL;
+       s_info.data_acs_name = NULL;
+       s_info.data_hm_url = NULL;
+       s_info.data_user_name = NULL;
+       s_info.data_pwd = NULL;
+       s_info.data_pxy_addr = NULL;
+       s_info.data_pxy_port = NULL;
+       s_info.data_hm_url = NULL;
 }
 
 /* ////////////////////////////////////////////////////////////////////////// */
@@ -945,7 +973,7 @@ static int _view_create(void *cb)
                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb,
                        NULL);
-       ad->con_create_gl = genlist;
+       s_info.con_create_gl = genlist;
 
        _init_context(ad);
 
@@ -970,15 +998,15 @@ static int _view_create(void *cb)
        rbtn = setting_create_button(ad->md.naviframe,
                        _("IDS_MSG_ACBUTTON_DONE_ABB"), "naviframe/title_right",
                        _click_softkey_done_cb, ad);
-       ad->navi_it = elm_naviframe_item_push(ad->md.naviframe,
+       s_info.navi_it = elm_naviframe_item_push(ad->md.naviframe,
                        _(title), NULL, NULL, genlist, NULL);
-       elm_object_item_part_content_set(ad->navi_it, "title_left_btn", lbtn);
-       elm_object_item_part_content_set(ad->navi_it, "title_right_btn", rbtn);
-       elm_naviframe_item_pop_cb_set(ad->navi_it, _naviframe_item_pop_cb, ad);
+       elm_object_item_part_content_set(s_info.navi_it, "title_left_btn", lbtn);
+       elm_object_item_part_content_set(s_info.navi_it, "title_right_btn", rbtn);
+       elm_naviframe_item_pop_cb_set(s_info.navi_it, _naviframe_item_pop_cb, ad);
 
        evas_object_data_set(ad->md.naviframe, "sip.naviframe.title_obj", "*");
 
-       ad->has_form_changed = FALSE;
+       s_info.has_form_changed = FALSE;
 
        setting_enable_expandable_genlist(genlist, ad,
                        __setting_network_connection_exp_cb,
@@ -987,43 +1015,43 @@ static int _view_create(void *cb)
 
        /* new a profile,need to select the "Service type" */
        if (!safeStrCmp(STR_SETTING_NEW_CONNECTIONS, ad->con_name)) {
-               ad->data_srv_type = setting_create_Gendial_exp_parent_field(
+               s_info.data_srv_type = setting_create_Gendial_exp_parent_field(
                                genlist, &itc_2text_3_parent,
                                NULL, NULL, SWALLOW_Type_INVALID,
                                _("IDS_MSGF_BODY_SERVICE_TYPE"),
                                _("IDS_ST_BODY_INTERNET_CONNECTION"));
-               if (ad->data_srv_type) {
-                       ad->data_srv_type->userdata = ad;
-                       __BACK_POINTER_SET(ad->data_srv_type);
+               if (s_info.data_srv_type) {
+                       s_info.data_srv_type->userdata = ad;
+                       __BACK_POINTER_SET(s_info.data_srv_type);
                } else {
-                       SETTING_TRACE_ERROR("ad->data_auth_type is NULL");
+                       SETTING_TRACE_ERROR("s_info.data_hm_url is NULL");
                }
        }
 
-       ad->ed_profile_name_desc = elm_entry_utf8_to_markup(
-                       ad->ed_profile_name_desc);
-       ad->ed_acs_name_desc = elm_entry_utf8_to_markup(ad->ed_acs_name_desc);
-       SETTING_TRACE("name :%s", ad->ed_profile_name_desc);
-       SETTING_TRACE("apn :%s", ad->ed_acs_name_desc);
+       s_info.ed_profile_name_desc = elm_entry_utf8_to_markup(
+                       s_info.ed_profile_name_desc);
+       s_info.ed_acs_name_desc = elm_entry_utf8_to_markup(s_info.ed_acs_name_desc);
+       SETTING_TRACE("name :%s", s_info.ed_profile_name_desc);
+       SETTING_TRACE("apn :%s", s_info.ed_acs_name_desc);
 
        /* [UI] Profile name */
-       if (!isEmptyStr(ad->ed_profile_name_desc)) {
+       if (!isEmptyStr(s_info.ed_profile_name_desc)) {
                /* Display */
-               ad->data_profile_name = setting_create_Gendial_field_def(
+               s_info.data_profile_name = setting_create_Gendial_field_def(
                                genlist, &itc_multiline_2text,
                                NULL, ad, SWALLOW_Type_INVALID,
                                NULL,
                                NULL, 0, /* chk_status*/
                                "IDS_ST_BODY_PROFILE_NAME",
-                               (char *)ad->ed_profile_name_desc, /* sub_desk*/
+                               (char *)s_info.ed_profile_name_desc, /* sub_desk*/
                                NULL);
        } else {
                /* Editor */
-               ad->data_profile_name = setting_create_Gendial_field_entry_with_return_key(
+               s_info.data_profile_name = setting_create_Gendial_field_entry_with_return_key(
                                genlist, &itc_editfield, NULL, ad,
                                SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0, "IDS_ST_BODY_PROFILE_NAME",
-                               (char *)ad->ed_profile_name_desc,
+                               (char *)s_info.ed_profile_name_desc,
                                _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_NORMAL,
@@ -1033,69 +1061,66 @@ static int _view_create(void *cb)
                                NULL);
        }
 
-       if (ad->data_profile_name) {
-               __BACK_POINTER_SET(ad->data_profile_name);
-               ad->data_profile_name->userdata = ad;
-               ad->data_profile_name->window = ad->md.window;
-               ad->data_profile_name->isSinglelineFlag = TRUE;
+       if (s_info.data_profile_name) {
+               __BACK_POINTER_SET(s_info.data_profile_name);
+               s_info.data_profile_name->userdata = ad;
+               s_info.data_profile_name->window = ad->md.window;
+               s_info.data_profile_name->isSinglelineFlag = TRUE;
                /* there is no CAPI to set profile name,so disable it: */
-               /* setting_disable_genlist_item(ad->data_profile_name->item); */
+               /* setting_disable_genlist_item(s_info.data_profile_name->item); */
                /* not create(first time) */
-               if (!isEmptyStr(ad->ed_profile_name_desc)) {
-                       elm_genlist_item_select_mode_set(
-                                       ad->data_profile_name->item,
-                                       ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-
+               if (!isEmptyStr(s_info.ed_profile_name_desc)) {
+                       elm_genlist_item_select_mode_set(s_info.data_profile_name->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                        /* setting_disable_genlist_item(
-                        * ad->data_profile_name->item); */
+                        * s_info.data_profile_name->item); */
                }
        } else {
-               SETTING_TRACE_ERROR("ad->data_profile_name is NULL");
+               SETTING_TRACE_ERROR("s_info.data_profile_name is NULL");
        }
 
        /* [UI] Access point name */
-       ad->data_acs_name = setting_create_Gendial_field_entry_with_return_key(
+       s_info.data_acs_name = setting_create_Gendial_field_entry_with_return_key(
                        genlist, &itc_editfield, NULL, ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
                        NULL, NULL, 0, "IDS_DLNA_BODY_ACCESS_POINT_NAME",
-                       (char *)ad->ed_acs_name_desc,
+                       (char *)s_info.ed_acs_name_desc,
                        _entry_changed_cb,
                        __network_max_len_reached,
                        ELM_INPUT_PANEL_LAYOUT_NORMAL,
                        FALSE, FALSE, 64, 64, NULL, NULL,
                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE, NULL, NULL);
-       if (ad->data_acs_name) {
-               __BACK_POINTER_SET(ad->data_acs_name);
-               ad->data_acs_name->userdata = ad;
-               ad->data_acs_name->isSinglelineFlag = TRUE;
-               ad->data_acs_name->window = ad->md.window;
+       if (s_info.data_acs_name) {
+               __BACK_POINTER_SET(s_info.data_acs_name);
+               s_info.data_acs_name->userdata = ad;
+               s_info.data_acs_name->isSinglelineFlag = TRUE;
+               s_info.data_acs_name->window = ad->md.window;
        } else {
-               SETTING_TRACE_ERROR("ad->data_acs_name is NULL");
+               SETTING_TRACE_ERROR("s_info.data_acs_name is NULL");
        }
 
        /* [UI] Authentication type */
-       ad->data_auth_type = setting_create_Gendial_field_def(genlist,
+       s_info.data_hm_url = setting_create_Gendial_field_def(genlist,
                        &itc_2text_3_parent, __create_auth_type_popup, ad,
                        SWALLOW_Type_INVALID,
                        NULL, NULL, 0, "IDS_ST_BODY_AUTH_TYPE",
-                       (char *)ad->ed_auth_type_desc, NULL);
-       if (ad->data_auth_type) {
-               ad->data_auth_type->userdata = ad;
-               __BACK_POINTER_SET(ad->data_auth_type);
+                       (char *)s_info.ed_auth_type_desc, NULL);
+       if (s_info.data_hm_url) {
+               s_info.data_hm_url->userdata = ad;
+               __BACK_POINTER_SET(s_info.data_hm_url);
 
-               ad->item_above_user_name = ad->data_auth_type->item;
+               s_info.item_above_user_name = s_info.data_hm_url->item;
        } else {
-               SETTING_TRACE_ERROR("ad->data_auth_type is NULL");
+               SETTING_TRACE_ERROR("s_info.data_hm_url is NULL");
        }
 
-       ad->is_show_user = 0;
-       if (CONNECTION_CELLULAR_AUTH_TYPE_NONE != ad->chkType) {
+       s_info.is_show_user = 0;
+       if (CONNECTION_CELLULAR_AUTH_TYPE_NONE != s_info.chkType) {
                /* [UI] User ID */
-               ad->data_user_name = setting_create_Gendial_field_entry_with_return_key(
+               s_info.data_user_name = setting_create_Gendial_field_entry_with_return_key(
                                genlist, &itc_editfield,
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0,
-                               KeyStr_UserID, (char *)ad->ed_user_name_desc,
+                               KeyStr_UserID, (char *)s_info.ed_user_name_desc,
                                _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_NORMAL,
@@ -1106,21 +1131,21 @@ static int _view_create(void *cb)
                                ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT,
                                _entry_next_activated_cb,
                                NULL);
-               if (ad->data_user_name) {
-                       __BACK_POINTER_SET(ad->data_user_name);
-                       ad->data_user_name->userdata = ad;
-                       ad->data_user_name->isSinglelineFlag = TRUE;
-                       ad->data_user_name->window = ad->md.window;
+               if (s_info.data_user_name) {
+                       __BACK_POINTER_SET(s_info.data_user_name);
+                       s_info.data_user_name->userdata = ad;
+                       s_info.data_user_name->isSinglelineFlag = TRUE;
+                       s_info.data_user_name->window = ad->md.window;
                } else {
-                       SETTING_TRACE_ERROR("ad->data_user_name is NULL");
+                       SETTING_TRACE_ERROR("s_info.data_user_name is NULL");
                }
 
                /* [UI] Password */
-               ad->data_pwd = setting_create_Gendial_field_entry_with_return_key(
+               s_info.data_pwd = setting_create_Gendial_field_entry_with_return_key(
                                genlist, &itc_editfield,
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0, "IDS_ST_BODY_PASSWORD",
-                               (char *)ad->ed_pwd_desc,
+                               (char *)s_info.ed_pwd_desc,
                                _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_NORMAL,
@@ -1131,39 +1156,39 @@ static int _view_create(void *cb)
                                ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT,
                                _entry_next_activated_cb,
                                NULL);
-               if (ad->data_pwd) {
-                       __BACK_POINTER_SET(ad->data_pwd);
-                       ad->data_pwd->userdata = ad;
-                       ad->data_pwd->window = ad->md.window;
-                       ad->data_pwd->isSinglelineFlag = TRUE;
-                       ad->is_show_user = 1;
-
-                       ad->item_above_proxy_add = ad->data_pwd->item;
+               if (s_info.data_pwd) {
+                       __BACK_POINTER_SET(s_info.data_pwd);
+                       s_info.data_pwd->userdata = ad;
+                       s_info.data_pwd->window = ad->md.window;
+                       s_info.data_pwd->isSinglelineFlag = TRUE;
+                       s_info.is_show_user = 1;
+
+                       s_info.item_above_proxy_add = s_info.data_pwd->item;
                } else {
-                       SETTING_TRACE_ERROR("ad->data_pwd is NULL");
+                       SETTING_TRACE_ERROR("s_info.data_pwd is NULL");
                }
        }
 
        /* [UI] Proxy address */
-       ad->data_pxy_addr = setting_create_Gendial_field_entry_with_return_key(
+       s_info.data_pxy_addr = setting_create_Gendial_field_entry_with_return_key(
                        genlist, &itc_editfield, NULL, ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
                        NULL, NULL, 0,
                        "IDS_ST_BODY_CONNECTIONSETTINGS_PROXY_ADDRESS",
-                       (char *)ad->ed_pxy_addr_desc,
+                       (char *)s_info.ed_pxy_addr_desc,
                        _entry_changed_cb,
                        __network_max_len_reached, ELM_INPUT_PANEL_LAYOUT_URL,
                        FALSE, FALSE, 512, 512, NULL, NULL,
                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT,
                        _entry_next_activated_cb,
                        NULL);
-       if (ad->data_pxy_addr) {
-               __BACK_POINTER_SET(ad->data_pxy_addr);
-               ad->data_pxy_addr->userdata = ad;
-               ad->data_pxy_addr->isSinglelineFlag = TRUE;
-               ad->data_pxy_addr->window = ad->md.window;
+       if (s_info.data_pxy_addr) {
+               __BACK_POINTER_SET(s_info.data_pxy_addr);
+               s_info.data_pxy_addr->userdata = ad;
+               s_info.data_pxy_addr->isSinglelineFlag = TRUE;
+               s_info.data_pxy_addr->window = ad->md.window;
        } else {
-               SETTING_TRACE_ERROR("ad->data_pxy_addr is NULL");
+               SETTING_TRACE_ERROR("s_info.data_pxy_addr is NULL");
        }
 
        /* Set SIP key on Next or Done if Home URL existed or not below. */
@@ -1179,97 +1204,97 @@ static int _view_create(void *cb)
        }
 
        /* [UI] Proxy port */
-       ad->data_pxy_port = setting_create_Gendial_field_entry_with_return_key(
+       s_info.data_pxy_port = setting_create_Gendial_field_entry_with_return_key(
                        genlist, &itc_editfield, NULL, ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
                        NULL, NULL, 0, "IDS_ST_BODY_PROXY_PORT",
-                       (char *)ad->ed_pxy_port_desc,
+                       (char *)s_info.ed_pxy_port_desc,
                        _entry_changed_cb,
                        __network_max_len_reached,
                        ELM_INPUT_PANEL_LAYOUT_NUMBERONLY,
                        FALSE, FALSE, 0, 5, "0123456789", NULL, type, cbFunc,
                        NULL);
-       if (ad->data_pxy_port) {
-               ad->data_pxy_port->userdata = ad;
-               ad->data_pxy_port->isSinglelineFlag = TRUE;
-               __BACK_POINTER_SET(ad->data_pxy_port);
-               ad->data_pxy_port->window = ad->md.window;
+       if (s_info.data_pxy_port) {
+               s_info.data_pxy_port->userdata = ad;
+               s_info.data_pxy_port->isSinglelineFlag = TRUE;
+               __BACK_POINTER_SET(s_info.data_pxy_port);
+               s_info.data_pxy_port->window = ad->md.window;
        } else {
-               SETTING_TRACE_ERROR("ad->data_pxy_port is NULL");
+               SETTING_TRACE_ERROR("s_info.data_pxy_port is NULL");
        }
 
        /* if current view is "MMS connection" */
        /*      mms Connection */
        if (!safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS)) {
                /* [UI] Home URL */
-               ad->data_hm_url = setting_create_Gendial_field_entry_with_return_key(
+               s_info.data_hm_url = setting_create_Gendial_field_entry_with_return_key(
                                genlist, &itc_editfield,
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0, "IDS_ST_BODY_HOME_URL",
-                               (char *)ad->ed_hm_url_desc,
+                               (char *)s_info.ed_hm_url_desc,
                                _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_URL,
                                FALSE, FALSE, 0, 521, NULL, NULL,
                                ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE, NULL,
                                NULL);
-               if (ad->data_hm_url) {
-                       __BACK_POINTER_SET(ad->data_hm_url);
-                       ad->data_hm_url->userdata = ad;
-                       ad->data_hm_url->isSinglelineFlag = TRUE;
-                       ad->data_hm_url->window = ad->md.window;
-                       ad->data_hm_url->return_key_type = ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE;
+               if (s_info.data_hm_url) {
+                       __BACK_POINTER_SET(s_info.data_hm_url);
+                       s_info.data_hm_url->userdata = ad;
+                       s_info.data_hm_url->isSinglelineFlag = TRUE;
+                       s_info.data_hm_url->window = ad->md.window;
+                       s_info.data_hm_url->return_key_type = ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE;
                } else {
-                       SETTING_TRACE_ERROR("ad->data_hm_url is NULL");
+                       SETTING_TRACE_ERROR("s_info.data_hm_url is NULL");
                }
        }
 
        /* [UI] APN protocol */
-       ad->data_pdn_type = setting_create_Gendial_field_def(genlist,
+       s_info.data_pdn_type = setting_create_Gendial_field_def(genlist,
                        &itc_2text_3_parent, __create_pdn_type_popup, ad,
                        SWALLOW_Type_INVALID,
                        NULL, NULL, 0, "APN protocol",
-                       (char *)ad->ed_pdn_type_desc, NULL);
-       if (ad->data_pdn_type)
-               ad->data_pdn_type->userdata = ad;
+                       (char *)s_info.ed_pdn_type_desc, NULL);
+       if (s_info.data_pdn_type)
+               s_info.data_pdn_type->userdata = ad;
        else
-               SETTING_TRACE_ERROR("ad->data_pdn_type is NULL");
+               SETTING_TRACE_ERROR("s_info.data_pdn_type is NULL");
 
        /* [UI] APN roaming protocol */
-       ad->data_roam_pdn_type = setting_create_Gendial_field_def(genlist,
+       s_info.data_roam_pdn_type = setting_create_Gendial_field_def(genlist,
                        &itc_2text_3_parent, __create_pdn_type_popup, ad,
                        SWALLOW_Type_INVALID,
                        NULL, NULL, 0, "APN roaming protocol",
-                       (char *)ad->ed_roam_pdn_type_desc, NULL);
-       if (ad->data_roam_pdn_type)
-               ad->data_roam_pdn_type->userdata = ad;
+                       (char *)s_info.ed_roam_pdn_type_desc, NULL);
+       if (s_info.data_roam_pdn_type)
+               s_info.data_roam_pdn_type->userdata = ad;
        else
-               SETTING_TRACE_ERROR("ad->data_roam_pdn_type is NULL");
+               SETTING_TRACE_ERROR("s_info.data_roam_pdn_type is NULL");
 
        setting_network_connection_create_view.is_create = 1;
-       ad->scl_edit = genlist;
+       s_info.scl_edit = genlist;
 
-       SETTING_TRACE("==> ad->is_editable:%d", ad->is_editable);
-       if (!ad->is_editable) {
-               if (ad->data_srv_type)
-                       setting_disable_genlist_item(ad->data_srv_type->item);
-               if (ad->data_profile_name)
+       SETTING_TRACE("==> s_info.is_editable:%d", s_info.is_editable);
+       if (!s_info.is_editable) {
+               if (s_info.data_srv_type)
+                       setting_disable_genlist_item(s_info.data_srv_type->item);
+               if (s_info.data_profile_name)
                        setting_disable_genlist_item(
-                                       ad->data_profile_name->item);
-               if (ad->data_acs_name)
-                       setting_disable_genlist_item(ad->data_acs_name->item);
-               if (ad->data_auth_type)
-                       setting_disable_genlist_item(ad->data_auth_type->item);
-               if (ad->data_user_name)
-                       setting_disable_genlist_item(ad->data_user_name->item);
-               if (ad->data_pwd)
-                       setting_disable_genlist_item(ad->data_pwd->item);
-               if (ad->data_pxy_addr)
-                       setting_disable_genlist_item(ad->data_pxy_addr->item);
-               if (ad->data_pxy_port)
-                       setting_disable_genlist_item(ad->data_pxy_port->item);
-               if (ad->data_hm_url)
-                       setting_disable_genlist_item(ad->data_hm_url->item);
+                                       s_info.data_profile_name->item);
+               if (s_info.data_acs_name)
+                       setting_disable_genlist_item(s_info.data_acs_name->item);
+               if (s_info.data_hm_url)
+                       setting_disable_genlist_item(s_info.data_hm_url->item);
+               if (s_info.data_user_name)
+                       setting_disable_genlist_item(s_info.data_user_name->item);
+               if (s_info.data_pwd)
+                       setting_disable_genlist_item(s_info.data_pwd->item);
+               if (s_info.data_pxy_addr)
+                       setting_disable_genlist_item(s_info.data_pxy_addr->item);
+               if (s_info.data_pxy_port)
+                       setting_disable_genlist_item(s_info.data_pxy_port->item);
+               if (s_info.data_hm_url)
+                       setting_disable_genlist_item(s_info.data_hm_url->item);
        }
 
        ecore_idler_add(__connection_idler, ad);
@@ -1286,31 +1311,31 @@ static int _view_destroy(void *cb)
        SettingNetwork *ad = (SettingNetwork *)cb;
 
        evas_object_data_set(ad->md.naviframe, "sip.naviframe.title_obj", NULL);
-       ad->navi_it = NULL;
+       s_info.navi_it = NULL;
        /* manager separatly, */
-       if (ad->l_button) {
-               evas_object_del(ad->l_button);
-               ad->l_button = NULL;
+       if (s_info.l_button) {
+               evas_object_del(s_info.l_button);
+               s_info.l_button = NULL;
        }
        /* if (ad->m_button)
         {
         evas_object_del(ad->m_button);
         ad->m_button = NULL;
         }*/
-       if (ad->r_button) {
-               evas_object_del(ad->r_button);
-               ad->r_button = NULL;
+       if (s_info.r_button) {
+               evas_object_del(s_info.r_button);
+               s_info.r_button = NULL;
        }
        /* FREE(ad->con_name); */
-       G_FREE(ad->ed_profile_name_desc);
-       G_FREE(ad->ed_acs_name_desc);
-       G_FREE(ad->ed_user_name_desc);
-       G_FREE(ad->ed_pwd_desc);
+       G_FREE(s_info.ed_profile_name_desc);
+       G_FREE(s_info.ed_acs_name_desc);
+       G_FREE(s_info.ed_user_name_desc);
+       G_FREE(s_info.ed_pwd_desc);
 
-       G_FREE(ad->ed_pxy_addr_desc);
-       G_FREE(ad->ed_pxy_port_desc);
+       G_FREE(s_info.ed_pxy_addr_desc);
+       G_FREE(s_info.ed_pxy_port_desc);
 
-       G_FREE(ad->ed_hm_url_desc);
+       G_FREE(s_info.ed_hm_url_desc);
 
        elm_naviframe_item_pop(ad->md.naviframe);
 
@@ -1340,23 +1365,23 @@ static int __save_connection(void *data)
        /* error check */
        retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       profile_name = (ad->data_profile_name) ? elm_entry_markup_to_utf8(
-                       ad->data_profile_name->sub_desc) : strdup("");
+       profile_name = (s_info.data_profile_name) ? elm_entry_markup_to_utf8(
+                       s_info.data_profile_name->sub_desc) : strdup("");
        SETTING_TRACE("profile_name:%s", acs_name);
-       acs_name = (ad->data_acs_name) ? elm_entry_markup_to_utf8(
-                       ad->data_acs_name->sub_desc) : strdup("");
+       acs_name = (s_info.data_acs_name) ? elm_entry_markup_to_utf8(
+                       s_info.data_acs_name->sub_desc) : strdup("");
        SETTING_TRACE("acs_name:%s", acs_name);
-       usr_name = (ad->data_user_name) ? elm_entry_markup_to_utf8(
-                       ad->data_user_name->sub_desc) : strdup("");
+       usr_name = (s_info.data_user_name) ? elm_entry_markup_to_utf8(
+                       s_info.data_user_name->sub_desc) : strdup("");
        SETTING_TRACE("usr_name:%s", usr_name);
-       pwd = (ad->data_pwd) ? elm_entry_markup_to_utf8(
-                       ad->data_pwd->sub_desc) : strdup("");
+       pwd = (s_info.data_pwd) ? elm_entry_markup_to_utf8(
+                       s_info.data_pwd->sub_desc) : strdup("");
        SETTING_TRACE("pwd:%s", pwd);
-       addr = (ad->data_pxy_addr) ? elm_entry_markup_to_utf8(
-                       ad->data_pxy_addr->sub_desc) : strdup("");
+       addr = (s_info.data_pxy_addr) ? elm_entry_markup_to_utf8(
+                       s_info.data_pxy_addr->sub_desc) : strdup("");
        SETTING_TRACE("addr:%s", addr);
-       port = (ad->data_pxy_port) ? elm_entry_markup_to_utf8(
-                       ad->data_pxy_port->sub_desc) : strdup("");
+       port = (s_info.data_pxy_port) ? elm_entry_markup_to_utf8(
+                       s_info.data_pxy_port->sub_desc) : strdup("");
        SETTING_TRACE("port:%s", port);
 
        if (!safeStrCmp(profile_name, "")) {
@@ -1387,8 +1412,8 @@ static int __save_connection(void *data)
                return SETTING_DNET_RETURN_NULL_ACCESS_NAME;
        }
 
-       if (ad->sel_profile_h) {
-               con_info = ad->sel_profile_h;
+       if (s_info.sel_profile_h) {
+               con_info = s_info.sel_profile_h;
        } else {
                if (!safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS)) {
                        (void)connection_profile_create(
@@ -1413,13 +1438,13 @@ static int __save_connection(void *data)
                                        CONNECTION_PROFILE_TYPE_CELLULAR,
                                        _(profile_name), &con_info);
                        if (CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET
-                                       == ad->srvType) {
+                                       == s_info.srvType) {
                                /* Internet */
                                (void)connection_profile_set_cellular_service_type(
                                                con_info,
                                                CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET);
                        } else if (CONNECTION_CELLULAR_SERVICE_TYPE_MMS
-                                       == ad->srvType) {
+                                       == s_info.srvType) {
                                /* MMS */
                                (void)connection_profile_set_cellular_service_type(
                                                con_info,
@@ -1454,10 +1479,10 @@ static int __save_connection(void *data)
        FREE(acs_name);
 
        /* save auth type */
-       type = ad->chkType;
+       type = s_info.chkType;
        SETTING_TRACE("-----> auth type: %d", type);
        SETTING_TRACE("-----> radio button state: %d",
-                       elm_radio_value_get(ad->chk_type));
+                       elm_radio_value_get(s_info.chk_type));
 
        (void)connection_profile_set_cellular_auth_info(con_info, type,
                        usr_name, pwd);
@@ -1515,8 +1540,8 @@ static int __save_connection(void *data)
                        || (!safeStrCmp(ad->con_name,
                                        STR_SETTING_NEW_CONNECTIONS)
                                        && CONNECTION_CELLULAR_SERVICE_TYPE_MMS
-                                                       == ad->srvType)) {
-               home = elm_entry_markup_to_utf8(ad->data_hm_url->sub_desc);
+                                                       == s_info.srvType)) {
+               home = elm_entry_markup_to_utf8(s_info.data_hm_url->sub_desc);
                if (home == (char *)NULL) {
                        (void)connection_profile_set_cellular_home_url(
                                        con_info, URL_HEAD);
@@ -1533,7 +1558,7 @@ static int __save_connection(void *data)
        }
 
        if (con_info_2) { /* creating both internet + MMS */
-               home = elm_entry_markup_to_utf8(ad->data_hm_url->sub_desc);
+               home = elm_entry_markup_to_utf8(s_info.data_hm_url->sub_desc);
                if (home == (char *)NULL) {
                        (void)connection_profile_set_cellular_home_url(
                                        con_info_2, URL_HEAD);
@@ -1647,7 +1672,7 @@ static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it)
        /* error check */
        retvm_if(!ad, EINA_TRUE, "Data parameter is NULL");
 
-       elm_object_tree_focus_allow_set(ad->con_create_gl, EINA_FALSE);
+       elm_object_tree_focus_allow_set(s_info.con_create_gl, EINA_FALSE);
        SETTING_TRACE("ad->con_name: %s", ad->con_name);
        setting_view_destroy(&setting_network_connection_create_view, ad);
        setting_view_update(&setting_view_network_con, ad);
@@ -1681,7 +1706,7 @@ static void _click_softkey_done_cb(void *data, Evas_Object *obj,
                                SETTING_FONT_RED, SETTING_FONT_BLACK);
        }
 
-       elm_object_tree_focus_allow_set(ad->con_create_gl, EINA_FALSE);
+       elm_object_tree_focus_allow_set(s_info.con_create_gl, EINA_FALSE);
 
        setting_create_popup(ad, ad->md.window, NULL, KeyStr_Saved,
                        __save_response_cb, 1, FALSE, FALSE, 0);
@@ -1702,48 +1727,48 @@ static void _click_softkey_cancel_cb(void *data, Evas_Object *obj,
 static void _check_entry_empty(SettingNetwork *ad)
 {
        SETTING_TRACE_BEGIN;
-       if (!ad->has_form_changed) {
-               SETTING_TRACE_DEBUG("ad->has_form_changed == FALSE!");
+       if (!s_info.has_form_changed) {
+               SETTING_TRACE_DEBUG("s_info.has_form_changed == FALSE!");
                return;
        }
        bool isFoundEmptyEntry = FALSE;
 
        do {
-               if (ad->data_profile_name
-                               && isEmptyStr(ad->data_profile_name->sub_desc)) {
+               if (s_info.data_profile_name
+                               && isEmptyStr(s_info.data_profile_name->sub_desc)) {
                        /* SETTING_TRACE("entry_str:%s",
-                        *  ad->data_profile_name->sub_desc); */
+                        *  s_info.data_profile_name->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
-               if (ad->data_acs_name
-                               && isEmptyStr(ad->data_acs_name->sub_desc)) {
+               if (s_info.data_acs_name
+                               && isEmptyStr(s_info.data_acs_name->sub_desc)) {
                        /* SETTING_TRACE("entry_str:%s",
-                        *  ad->data_acs_name->sub_desc); */
+                        *  s_info.data_acs_name->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
-               if (ad->data_user_name
-                               && isEmptyStr(ad->data_user_name->sub_desc)) {
+               if (s_info.data_user_name
+                               && isEmptyStr(s_info.data_user_name->sub_desc)) {
                        /* SETTING_TRACE("entry_str:%s",
-                        * ad->data_user_name->sub_desc); */
+                        * s_info.data_user_name->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
-               if (ad->data_pwd && isEmptyStr(ad->data_pwd->sub_desc)) {
+               if (s_info.data_pwd && isEmptyStr(s_info.data_pwd->sub_desc)) {
                        /* SETTING_TRACE("entry_str:%s",
-                        *  ad->data_pwd->sub_desc); */
+                        *  s_info.data_pwd->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
-               if (ad->data_hm_url && isEmptyStr(ad->data_hm_url->sub_desc)) {
+               if (s_info.data_hm_url && isEmptyStr(s_info.data_hm_url->sub_desc)) {
                        /* SETTING_TRACE("entry_str:%s",
-                        * ad->data_hm_url->sub_desc); */
+                        * s_info.data_hm_url->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
        } while (0);
-       Evas_Object *done_btn = elm_object_item_part_content_get(ad->navi_it,
+       Evas_Object *done_btn = elm_object_item_part_content_get(s_info.navi_it,
                        NAVI_BTN_STYLE_LEFT);
        if (isFoundEmptyEntry) {
                /* it had not yet been disabled */
@@ -1768,139 +1793,128 @@ static void _display_auth_type(SettingNetwork *ad, int auth_type)
 {
        SETTING_TRACE_BEGIN;
        retm_if(ad == NULL, "Data parameter is NULL");
-       if (ad->chkType == auth_type)
+       if (s_info.chkType == auth_type)
                return;
 
-       ad->chkType = auth_type; /* for update genlist */
+       s_info.chkType = auth_type; /* for update genlist */
        if (CONNECTION_CELLULAR_AUTH_TYPE_NONE != auth_type) { /* to show */
-               SETTING_TRACE("ad->is_show_user:%d", ad->is_show_user);
-               if (ad->is_show_user == 0) { /* do only when hiden */
+               SETTING_TRACE("s_info.is_show_user:%d", s_info.is_show_user);
+               if (s_info.is_show_user == 0) { /* do only when hiden */
                        SETTING_TRACE("to create");
 
-                       ad->data_user_name = (Setting_GenGroupItem_Data *)calloc(
+                       s_info.data_user_name = (Setting_GenGroupItem_Data *)calloc(
                                        1, sizeof(Setting_GenGroupItem_Data));
-                       setting_retm_if(ad->data_user_name == NULL,
+                       setting_retm_if(s_info.data_user_name == NULL,
                                        "calloc failed");
-                       ad->data_user_name->keyStr = (char *)g_strdup(
+                       s_info.data_user_name->keyStr = (char *)g_strdup(
                                        KeyStr_UserID);
-                       ad->data_user_name->sub_desc = (char *)g_strdup(
-                                       ad->ed_user_name_desc);
-                       ad->data_user_name->swallow_type =
+                       s_info.data_user_name->sub_desc = (char *)g_strdup(
+                                       s_info.ed_user_name_desc);
+                       s_info.data_user_name->swallow_type =
                                        SWALLOW_Type_LAYOUT_EDITFIELD;
-                       ad->data_user_name->isSinglelineFlag = TRUE;
-                       ad->data_user_name->userdata = ad;
+                       s_info.data_user_name->isSinglelineFlag = TRUE;
+                       s_info.data_user_name->userdata = ad;
 
-                       ad->data_user_name->return_key_type =
+                       s_info.data_user_name->return_key_type =
                                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
-                       ad->data_user_name->activated_cb =
+                       s_info.data_user_name->activated_cb =
                                        _entry_next_activated_cb;
 
-                       ad->data_user_name->maxlength_reached_cb =
+                       s_info.data_user_name->maxlength_reached_cb =
                                        __network_max_len_reached;
-                       ad->data_user_name->disable_auto_cap = EINA_TRUE;
+                       s_info.data_user_name->disable_auto_cap = EINA_TRUE;
 
-                       __BACK_POINTER_SET(ad->data_user_name);
+                       __BACK_POINTER_SET(s_info.data_user_name);
 
-                       ad->data_user_name->chk_change_cb =
+                       s_info.data_user_name->chk_change_cb =
                                        _entry_changed_cb;
-                       ad->data_user_name->limit_filter_data = calloc(1,
+                       s_info.data_user_name->limit_filter_data = calloc(1,
                                        sizeof(Elm_Entry_Filter_Accept_Set));
-                       if (ad->data_user_name->limit_filter_data) {
-                               ad->data_user_name->limit_filter_data->max_byte_count =
+                       if (s_info.data_user_name->limit_filter_data) {
+                               s_info.data_user_name->limit_filter_data->max_byte_count =
                                                MAX_PDP_AUTH_USERNAME_LEN_MAX;
-                               ad->data_user_name->window = ad->md.window;
+                               s_info.data_user_name->window = ad->md.window;
                        }
-                       ad->data_user_name->item = elm_genlist_item_insert_after(
-                                       ad->scl_edit, &itc_editfield,
-                                       ad->data_user_name,
-                                       NULL, ad->item_above_user_name,
+                       s_info.data_user_name->item = elm_genlist_item_insert_after(
+                                       s_info.scl_edit, &itc_editfield,
+                                       s_info.data_user_name,
+                                       NULL, s_info.item_above_user_name,
                                        ELM_GENLIST_ITEM_NONE,
                                        NULL, ad);
 
-                       ad->data_pwd = (Setting_GenGroupItem_Data *)calloc(1,
+                       s_info.data_pwd = (Setting_GenGroupItem_Data *)calloc(1,
                                        sizeof(Setting_GenGroupItem_Data));
 
-                       setting_retm_if(ad->data_pwd == NULL, "calloc failed");
-                       ad->data_pwd->keyStr = (char *)g_strdup(
+                       setting_retm_if(s_info.data_pwd == NULL, "calloc failed");
+                       s_info.data_pwd->keyStr = (char *)g_strdup(
                                        "IDS_ST_BODY_PASSWORD");
-                       ad->data_pwd->sub_desc = (char *)g_strdup(
-                                       ad->ed_pwd_desc);
-                       ad->data_pwd->swallow_type =
+                       s_info.data_pwd->sub_desc = (char *)g_strdup(
+                                       s_info.ed_pwd_desc);
+                       s_info.data_pwd->swallow_type =
                                        SWALLOW_Type_LAYOUT_EDITFIELD;
-                       ad->data_pwd->userdata = ad;
-                       ad->data_pwd->chk_change_cb =
+                       s_info.data_pwd->userdata = ad;
+                       s_info.data_pwd->chk_change_cb =
                                        _entry_changed_cb;
-                       ad->data_pwd->isPasswordFlag = TRUE;
-                       ad->data_pwd->isSinglelineFlag = TRUE;
+                       s_info.data_pwd->isPasswordFlag = TRUE;
+                       s_info.data_pwd->isSinglelineFlag = TRUE;
 
-                       ad->data_pwd->return_key_type =
+                       s_info.data_pwd->return_key_type =
                                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
-                       ad->data_pwd->activated_cb =
+                       s_info.data_pwd->activated_cb =
                                        _entry_next_activated_cb;
 
-                       ad->data_pwd->maxlength_reached_cb =
+                       s_info.data_pwd->maxlength_reached_cb =
                                        __network_max_len_reached;
-                       ad->data_pwd->disable_auto_cap = EINA_TRUE;
+                       s_info.data_pwd->disable_auto_cap = EINA_TRUE;
 
-                       __BACK_POINTER_SET(ad->data_pwd);
+                       __BACK_POINTER_SET(s_info.data_pwd);
 
-                       /* ad->data_pwd->chk_change_cb = chk_change_cb; */
-                       ad->data_pwd->limit_filter_data = calloc(1,
-                                       sizeof(Elm_Entry_Filter_Accept_Set));
-                       if (ad->data_pwd->limit_filter_data) {
-                               ad->data_pwd->limit_filter_data->max_byte_count =
-                                               MAX_PDP_AUTH_PASSWORD_LEN_MAX;
-                               ad->data_pwd->window = ad->md.window;
+                       /* s_info.data_pwd->chk_change_cb = chk_change_cb; */
+                       s_info.data_pwd->limit_filter_data = calloc(1, sizeof(Elm_Entry_Filter_Accept_Set));
+                       if (s_info.data_pwd->limit_filter_data) {
+                               s_info.data_pwd->limit_filter_data->max_byte_count = MAX_PDP_AUTH_PASSWORD_LEN_MAX;
+                               s_info.data_pwd->window = ad->md.window;
                        }
-                       ad->data_pwd->item = elm_genlist_item_insert_after(
-                                       ad->scl_edit, &itc_editfield,
-                                       ad->data_pwd, NULL,
-                                       ad->data_user_name->item,
+                       s_info.data_pwd->item = elm_genlist_item_insert_after(
+                                       s_info.scl_edit, &itc_editfield,
+                                       s_info.data_pwd, NULL,
+                                       s_info.data_user_name->item,
                                        ELM_GENLIST_ITEM_NONE,
                                        NULL, ad);
 
-                       ad->item_above_proxy_add = ad->data_pwd->item;
-                       /* item = st_item_insert_after(ad->scl_edit,
-                        &itc_seperator,
-                        NULL, NULL,
-                        ad->data_pwd->item,
-                        ELM_GENLIST_ITEM_NONE,
-                        NULL, NULL);
-                        elm_genlist_item_select_mode_set
-                        (item , ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);*/
-
-                       ad->has_form_changed = TRUE;
+                       s_info.item_above_proxy_add = s_info.data_pwd->item;
+                       s_info.has_form_changed = TRUE;
                        _check_entry_empty(ad);
                        elm_genlist_item_select_mode_set(
-                                       ad->data_user_name->item,
+                                       s_info.data_user_name->item,
                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-                       elm_genlist_item_select_mode_set(ad->data_pwd->item,
+                       elm_genlist_item_select_mode_set(s_info.data_pwd->item,
                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
-                       /* ad->is_show_user = 1; */
+                       /* s_info.is_show_user = 1; */
                }
-               ad->is_show_user = 1;
+               s_info.is_show_user = 1;
        } else { /* to hide */
 
-               SETTING_TRACE("ad->is_show_user:%d", ad->is_show_user);
-               if (ad->is_show_user == 1) { /* do only when shown */
+               SETTING_TRACE("s_info.is_show_user:%d", s_info.is_show_user);
+               if (s_info.is_show_user == 1) { /* do only when shown */
                        SETTING_TRACE("to destroy");
-                       if (ad->data_user_name) {
-                               elm_object_item_del(ad->data_user_name->item);
-                               ad->data_user_name = NULL;
+                       if (s_info.data_user_name) {
+                               elm_object_item_del(s_info.data_user_name->item);
+                               s_info.data_user_name = NULL;
                        }
-                       if (ad->data_pwd) {
-                               elm_object_item_del(ad->data_pwd->item);
-                               ad->data_pwd = NULL;
+                       if (s_info.data_pwd) {
+                               elm_object_item_del(s_info.data_pwd->item);
+                               s_info.data_pwd = NULL;
                        }
-                       if (ad->item_above_proxy_add) {
-                               elm_object_item_del(ad->item_above_proxy_add);
-                               ad->item_above_proxy_add = NULL;
+                       if (s_info.item_above_proxy_add) {
+                               elm_object_item_del(s_info.item_above_proxy_add);
+                               s_info.item_above_proxy_add = NULL;
                        }
 
                }
-               ad->has_form_changed = TRUE;
+               s_info.has_form_changed = TRUE;
                _check_entry_empty(ad);
-               ad->is_show_user = 0;
+               s_info.is_show_user = 0;
 
        }
 }
@@ -1918,31 +1932,31 @@ static void _entry_changed_cb(void *data, Evas_Object *obj, void *event_info)
        list_item->enterKeyPressFlag = FALSE;
        /* G_FREE(list_item->sub_desc);//release first */
        list_item->sub_desc = (char *)g_strdup(entry_str);
-       ad->has_form_changed = TRUE;
+       s_info.has_form_changed = TRUE;
        _check_entry_empty(ad);
 }
 
 static void _hide_input_pannel(SettingNetwork *ad)
 {
        SETTING_TRACE_BEGIN;
-       if (ad->data_profile_name && ad->data_profile_name->eo_check)
-               setting_hide_input_pannel_cb(ad->data_profile_name->eo_check);
+       if (s_info.data_profile_name && s_info.data_profile_name->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_profile_name->eo_check);
 
-       if (ad->data_acs_name && ad->data_acs_name->eo_check)
-               setting_hide_input_pannel_cb(ad->data_acs_name->eo_check);
+       if (s_info.data_acs_name && s_info.data_acs_name->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_acs_name->eo_check);
 
-       if (ad->data_user_name && ad->data_user_name->eo_check)
-               setting_hide_input_pannel_cb(ad->data_user_name->eo_check);
+       if (s_info.data_user_name && s_info.data_user_name->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_user_name->eo_check);
 
-       if (ad->data_pwd && ad->data_pwd->eo_check)
-               setting_hide_input_pannel_cb(ad->data_pwd->eo_check);
+       if (s_info.data_pwd && s_info.data_pwd->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_pwd->eo_check);
 
-       if (ad->data_pxy_addr && ad->data_pxy_addr->eo_check)
-               setting_hide_input_pannel_cb(ad->data_pxy_addr->eo_check);
+       if (s_info.data_pxy_addr && s_info.data_pxy_addr->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_pxy_addr->eo_check);
 
-       if (ad->data_pxy_port && ad->data_pxy_port->eo_check)
-               setting_hide_input_pannel_cb(ad->data_pxy_port->eo_check);
+       if (s_info.data_pxy_port && s_info.data_pxy_port->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_pxy_port->eo_check);
 
-       if (ad->data_hm_url && ad->data_hm_url->eo_check)
-               setting_hide_input_pannel_cb(ad->data_hm_url->eo_check);
+       if (s_info.data_hm_url && s_info.data_hm_url->eo_check)
+               setting_hide_input_pannel_cb(s_info.data_hm_url->eo_check);
 }
index a262fcb35a8e392cd42fe8f0d43341a2a89767e1..982863e73452e17e74a0e64c70a6904761cafbda 100755 (executable)
                } \
        } while (0);
 
+static struct setting_network_main {
+       Evas_Object *popup_chk;
+       Evas_Object *popup_data_on;
+       Evas_Object *popup_data_off;
+       Setting_GenGroupItem_Data *service_providers;
+       Setting_GenGroupItem_Data *network_mode_sim_1;
+       Setting_GenGroupItem_Data *network_mode_sim_2;
+       Setting_GenGroupItem_Data *data_connection;
+} s_info = {0,};
+
 static int _view_create(void *cb);
 static int _view_destroy(void *cb);
 static int _view_update(void *cb);
+static int _view_language_changed(void *cb);
 
 setting_view setting_view_network_main = {
        .create = _view_create,
        .destroy = _view_destroy,
        .update = _view_update,
+       .langchanged = _view_language_changed,
        .cleanup = NULL, };
 
 static void _item_Gendial_mouse_up_cb(void *data,
@@ -537,7 +549,7 @@ static int _view_create(void *cb)
 
        /* ************* Service providers ************* */
 
-       ad->service_providers = setting_create_Gendial_field_def(ad->md.genlist,
+       s_info.service_providers = setting_create_Gendial_field_def(ad->md.genlist,
                        &itc_1text,
                        _item_Gendial_mouse_up_cb, ad,
                        SWALLOW_Type_INVALID, NULL, NULL, 0,
@@ -553,7 +565,7 @@ static int _view_create(void *cb)
                        NULL,
                        NULL);
 
-       ad->network_mode_sim_2 = setting_create_Gendial_field_def(ad->md.genlist,
+       s_info.network_mode_sim_2 = setting_create_Gendial_field_def(ad->md.genlist,
                        &itc_2text_3_parent,
                        _item_Gendial_mouse_up_cb, ad,
                        SWALLOW_Type_INVALID, NULL, NULL, 0,
@@ -576,16 +588,16 @@ static int _view_create(void *cb)
 //     _get_network_selected_desc(ad, sel_network_desc, MAX_COMMON_BUFFER_LEN);
 
        /* [UI] Connection mode description */
-       ad->data_connection = setting_create_Gendial_field_def(ad->md.genlist,
+       s_info.data_connection = setting_create_Gendial_field_def(ad->md.genlist,
                        &itc_1text,
                        _item_Gendial_mouse_up_cb, ad,
                        SWALLOW_Type_INVALID, NULL, NULL, 0, CONNECTION_DSC,
                        NULL, NULL);
-       if (ad->data_connection) {
-               __BACK_POINTER_SET(ad->data_connection);
-               ad->data_connection->userdata = ad;
+       if (s_info.data_connection) {
+               __BACK_POINTER_SET(s_info.data_connection);
+               s_info.data_connection->userdata = ad;
        } else {
-               SETTING_TRACE_ERROR("ad->data_connection is NULL");
+               SETTING_TRACE_ERROR("s_info.data_connection is NULL");
        }
 
        vconf_notify_key_changed(VCONFKEY_3G_ENABLE, __3g_change_cb, ad);
@@ -770,7 +782,7 @@ static void _item_Gendial_mouse_up_cb(void *data,
                                SETTING_TRACE_ERROR(
                                                "Failed to get vconf value");
                        }
-                       ad->popup_data_off = setting_create_popup2(ad,
+                       s_info.popup_data_off = setting_create_popup2(ad,
                                        ad->md.window,
                                        "IDS_ST_HEADER_TURN_OFF_MOBILE_DATA",
                                        "IDS_ST_POP_UNLESS_YOU_CONNECT_TO_A_WI_FI_NETWORK_YOU_WILL_NOT_BE_ABLE_TO_USE_THE_INTERNET_EMAIL_OR_OTHER_APPS_MSG",
@@ -803,7 +815,7 @@ static void _item_Gendial_mouse_up_cb(void *data,
                                SETTING_TRACE_ERROR(
                                                "Failed to get vconf value");
                        }
-                       ad->popup_data_on = setting_create_popup2(ad,
+                       s_info.popup_data_on = setting_create_popup2(ad,
                                        ad->md.window,
                                        "IDS_ST_HEADER_TURN_ON_MOBILE_DATA",
                                        "IDS_ST_POP_MOBILE_DATA_WILL_BE_TURNED_ON_CONNECTING_TO_MOBILE_NETWORKS_MAY_RESULT_IN_ADDITIONAL_CHARGES_DEPENDING_ON_YOUR_PAYMENT_PLAN",
@@ -865,7 +877,7 @@ static void _chk_btn_cb(void *data, Evas_Object *obj,
                                SETTING_TRACE_ERROR(
                                                "Failed to get vconf value");
                        }
-                       ad->popup_data_off = setting_create_popup2(ad,
+                       s_info.popup_data_off = setting_create_popup2(ad,
                                        ad->md.window,
                                        "IDS_ST_HEADER_TURN_OFF_MOBILE_DATA",
                                        "IDS_ST_POP_UNLESS_YOU_CONNECT_TO_A_WI_FI_NETWORK_YOU_WILL_NOT_BE_ABLE_TO_USE_THE_INTERNET_EMAIL_OR_OTHER_APPS_MSG",
@@ -902,7 +914,7 @@ static void _chk_btn_cb(void *data, Evas_Object *obj,
                                SETTING_TRACE_ERROR(
                                                "Failed to get vconf value");
                        }
-                       ad->popup_data_on = setting_create_popup2(ad,
+                       s_info.popup_data_on = setting_create_popup2(ad,
                                        ad->md.window,
                                        "IDS_ST_HEADER_TURN_ON_MOBILE_DATA",
                                        "IDS_ST_POP_MOBILE_DATA_WILL_BE_TURNED_ON_CONNECTING_TO_MOBILE_NETWORKS_MAY_RESULT_IN_ADDITIONAL_CHARGES_DEPENDING_ON_YOUR_PAYMENT_PLAN",
@@ -964,8 +976,8 @@ static void _use_packet_resp_cb(void *data, Evas_Object *obj,
                        setting_retm_if(err != 0, "set vconf failed");
                        setting_update_gl_item_chk_status(ad->data_mobile_data,
                                        1);
-                       if (ad->popup_chk && elm_check_state_get(
-                                       ad->popup_chk)) {
+                       if (s_info.popup_chk && elm_check_state_get(
+                                       s_info.popup_chk)) {
                                (void)vconf_set_bool(
                                                VCONFKEY_SETAPPL_MOBILE_DATA_ON_REMINDER,
                                                0);
@@ -988,8 +1000,8 @@ static void _use_packet_resp_cb(void *data, Evas_Object *obj,
                        setting_retm_if(err != 0, "set vconf failed");
                        setting_update_gl_item_chk_status(ad->data_mobile_data,
                                        0);
-                       if (ad->popup_chk && elm_check_state_get(
-                                       ad->popup_chk)) {
+                       if (s_info.popup_chk && elm_check_state_get(
+                                       s_info.popup_chk)) {
                                (void)vconf_set_bool(
                                                VCONFKEY_SETAPPL_MOBILE_DATA_OFF_REMINDER,
                                                0);
@@ -1017,13 +1029,13 @@ static void _use_packet_resp_cb(void *data, Evas_Object *obj,
                /* rollback */
                _setting_network_popup_mobile_data_rollback(ad);
        }
-       if (ad->popup_data_off) {
-               evas_object_del(ad->popup_data_off);
-               ad->popup_data_off = NULL;
+       if (s_info.popup_data_off) {
+               evas_object_del(s_info.popup_data_off);
+               s_info.popup_data_off = NULL;
        }
-       if (ad->popup_data_on) {
-               evas_object_del(ad->popup_data_on);
-               ad->popup_data_on = NULL;
+       if (s_info.popup_data_on) {
+               evas_object_del(s_info.popup_data_on);
+               s_info.popup_data_on = NULL;
        }
 
 }
@@ -1095,3 +1107,41 @@ static void __setting_network_data_roaming_resp_cb(void *data, Evas_Object *obj,
        }
 }
 
+
+static void __update_mobile_data_on_popup(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == data, "data is NULL");
+       ret_if(NULL == s_info.popup_data_on);
+       elm_object_text_set(s_info.popup_data_on, _(Data_packet_Popup_desc));
+}
+
+static void __update_mobile_data_off_popup(void *data)
+{
+       SETTING_TRACE_BEGIN;
+       setting_retm_if(NULL == data, "data is NULL");
+       ret_if(NULL == s_info.popup_data_off);
+
+       char *pop_info = NULL;
+       char *pop_title = NULL;
+
+       pop_info = (char *)g_strdup(
+                       _(KeyStr_Network_Mobile_Data_Has_Been_Disabled_Msg));
+       pop_title = (char *)g_strdup(_(KeyStr_Network_Turn_Off_Mobile_Data));
+
+       elm_object_text_set(s_info.popup_data_off, _(pop_info));
+
+       if (pop_title) {
+               elm_object_part_text_set(s_info.popup_data_off, "title,text",
+                               _(pop_title));
+       }
+       G_FREE(pop_title);
+       G_FREE(pop_info);
+}
+
+static int _view_language_changed(void *cb)
+{
+       __update_mobile_data_on_popup(cb);
+       __update_mobile_data_off_popup(cb);
+       return SETTING_RETURN_SUCCESS;
+}
index 7ed9f2a17f9605e2d513090c92eb8de9592087ce..17169764c3c568b1e1dbe0f1cc13fb1f1ce6f47f 100644 (file)
@@ -27,6 +27,13 @@ static void setting_network_profile_delete_click_softkey_cancel_ctx_cb(
                void *data, Evas_Object *obj, void *event_info);
 static Eina_Bool __naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
 
+static struct setting_network_profile_delete_info {
+       Evas_Object *data_connection;
+       Elm_Object_Item *navi_it_profile_del_list;
+       Evas_Object *gl_profile_del;
+       Eina_List *profile_del_list;
+} s_info = {0,};
+
 setting_view setting_view_network_profile_delete = {
        .create = setting_network_profile_delete_create,
        .destroy = setting_network_profile_delete_destroy,
@@ -41,16 +48,16 @@ setting_view setting_view_network_profile_delete = {
 static void __profile_delete_list_draw(SettingNetwork *ad)
 {
        SETTING_TRACE_BEGIN;
-       if (ad->profile_del_list != NULL) {
-               eina_list_free(ad->profile_del_list);
-               ad->profile_del_list = NULL;
+       if (s_info.profile_del_list != NULL) {
+               eina_list_free(s_info.profile_del_list);
+               s_info.profile_del_list = NULL;
        }
-       elm_genlist_clear(ad->gl_profile_del); /* first to clear list */
+       elm_genlist_clear(s_info.gl_profile_del); /* first to clear list */
 
        /* item = elm_genlist_item_append(scroller, &itc_seperator, NULL, NULL,
         * ELM_GENLIST_ITEM_GROUP, NULL, NULL); */
        /*m_Object_Item *first_item;
-        first_item = elm_genlist_item_append(ad->gl_profile_del,
+        first_item = elm_genlist_item_append(s_info.gl_profile_del,
         &itc_seperator, NULL, NULL,
         ELM_GENLIST_ITEM_NONE, NULL, NULL);
         elm_genlist_item_select_mode_set(first_item,
@@ -115,20 +122,20 @@ static void __profile_delete_list_draw(SettingNetwork *ad)
                item_data->sub_desc = (char *)g_strdup(apn);
                item_data->belongs_to = (int_of_ptr_size)profile_h;
 
-               item_data->item = elm_genlist_item_append(ad->gl_profile_del,
+               item_data->item = elm_genlist_item_append(s_info.gl_profile_del,
                                &(itc_2text_1icon_2), item_data, NULL,
                                ELM_GENLIST_ITEM_NONE,
                                setting_network_profile_delete_mouse_up_cb, ad);
-               ad->profile_del_list = eina_list_append(ad->profile_del_list,
+               s_info.profile_del_list = eina_list_append(s_info.profile_del_list,
                                item_data);
 
                idx++;
        }
 
        Evas_Object *toolbar = elm_object_item_part_content_get(
-                       ad->navi_it_profile_del_list, "toolbar");
+                       s_info.data_connection, "toolbar");
        Evas_Object *allbtn = elm_object_item_part_content_get(
-                       ad->navi_it_profile_del_list, "title_left_btn");
+                       s_info.data_connection, "title_left_btn");
        SETTING_TRACE("idx:%d", idx);
        if (idx == 1) {
                if (allbtn)
@@ -280,15 +287,15 @@ static int setting_network_profile_delete_create(void *cb)
        elm_genlist_clear(scroller); /* first to clear list */
        evas_object_smart_callback_add(scroller, "realized", __gl_realized_cb,
                        NULL);
-       ad->gl_profile_del = scroller;
+       s_info.gl_profile_del = scroller;
 
-       ad->navi_it_profile_del_list = setting_push_to_naviframe_with_back_button(
+       s_info.data_connection = setting_push_to_naviframe_with_back_button(
                        _(IDS_ST_BODY_DELETE), NULL,
                        __naviframe_item_pop_cb,
                        ad, scroller, ad->md.naviframe);
        /*disable Delete button */
        Evas_Object *toolbar = elm_object_item_part_content_get(
-                       ad->navi_it_profile_del_list, "toolbar");
+                       s_info.data_connection, "toolbar");
        Elm_Object_Item *it = elm_toolbar_last_item_get(toolbar);
        elm_object_item_disabled_set(it, EINA_TRUE);
 
@@ -302,12 +309,12 @@ static int setting_network_profile_delete_create(void *cb)
                        setting_network_profile_delete_click_softkey_select_all_cb,
                        ad);
        evas_object_show(allbtn);
-       elm_object_item_part_content_set(ad->navi_it_profile_del_list,
+       elm_object_item_part_content_set(s_info.data_connection,
                        "title_right_btn", allbtn);
 
-       if (ad->navi_it_profile_del_list) {
+       if (s_info.data_connection) {
                elm_object_item_domain_text_translatable_set(
-                               ad->navi_it_profile_del_list, SETTING_PACKAGE,
+                               s_info.data_connection, SETTING_PACKAGE,
                                EINA_TRUE);
        }
 
@@ -316,13 +323,13 @@ static int setting_network_profile_delete_create(void *cb)
        elm_object_style_set(morebtn, "naviframe/more/default");
        evas_object_smart_callback_add(morebtn, "clicked",
                        create_ctxpopup_more_button_cb, ad);
-       elm_object_item_part_content_set(ad->navi_it_profile_del_list,
+       elm_object_item_part_content_set(s_info.data_connection,
                        "toolbar_more_btn", morebtn);
 
 #if 0
        /* ADD 'SELECT ALL' */
        ad->data_delete_all = setting_create_Gendial_field_1radio(
-                       ad->gl_profile_del, &(ad->itc_1icon_1text_sub),
+                       s_info.gl_profile_del, &(ad->itc_1icon_1text_sub),
                        __screen_timeout_cb, ad,
                        SWALLOW_Type_1RADIO_RIGHT,
                        rdg, 4, KeyStr_Backlight_5_MIN_STR,
@@ -349,12 +356,12 @@ static int setting_network_profile_delete_destroy(void *cb)
                return SETTING_RETURN_SUCCESS;
 
        /* free data */
-       if (ad->profile_del_list != NULL) {
-               eina_list_free(ad->profile_del_list);
-               ad->profile_del_list = NULL;
+       if (s_info.profile_del_list != NULL) {
+               eina_list_free(s_info.profile_del_list);
+               s_info.profile_del_list = NULL;
        }
-       ad->gl_profile_del = NULL;
-       ad->navi_it_profile_del_list = NULL;
+       s_info.gl_profile_del = NULL;
+       s_info.data_connection = NULL;
        elm_naviframe_item_pop(ad->md.naviframe);
        setting_view_network_profile_delete.is_create = 0;
 
@@ -388,7 +395,7 @@ void ___profile_selected(void *data)
 {
        SettingNetwork *ad = data;
        retm_if(ad == NULL, "Invalid argument: ad is NULL");
-       Eina_List *check_list = ad->profile_del_list;
+       Eina_List *check_list = s_info.profile_del_list;
        Setting_GenGroupItem_Data *item_data = NULL;
        int selnum = 0;
        while (check_list) {
@@ -511,7 +518,7 @@ static void setting_network_profile_delete_click_softkey_delete_cb(void *data,
        /* error check */
        ret_if(!ad);
 
-       check_list = ad->profile_del_list;
+       check_list = s_info.profile_del_list;
        while (check_list) {
                item_data = (Setting_GenGroupItem_Data *)eina_list_data_get(
                                check_list);
@@ -580,8 +587,8 @@ static void setting_network_profile_delete_click_softkey_delete_cb(void *data,
                setting_create_popup(ad, ad->md.window, NULL, _(speciliztion),
                                NULL, 0, false, false, 0);
 
-               if (ad->navi_it_profile_del_list)
-                       elm_object_item_text_set(ad->navi_it_profile_del_list,
+               if (s_info.data_connection)
+                       elm_object_item_text_set(s_info.data_connection,
                                        _("IDS_ST_BODY_DELETE"));
 
                if (ok_cnt)
@@ -589,7 +596,7 @@ static void setting_network_profile_delete_click_softkey_delete_cb(void *data,
 
                /*disable Delete button */
                Evas_Object *toolbar = elm_object_item_part_content_get(
-                               ad->navi_it_profile_del_list, "toolbar");
+                               s_info.data_connection, "toolbar");
                Elm_Object_Item *it = elm_toolbar_last_item_get(toolbar);
                elm_object_item_disabled_set(it, EINA_TRUE);
        }
@@ -612,8 +619,7 @@ static void setting_network_profile_delete_click_softkey_select_all_cb(
 {
        SETTING_TRACE_BEGIN;
        retm_if(data == NULL, "Data parameter is NULL");
-       SettingNetwork *ad = data;
-       Eina_List *check_list = ad->profile_del_list;
+       Eina_List *check_list = s_info.profile_del_list;
        Setting_GenGroupItem_Data *item_data = NULL;
        int selnum = 0;
        int un_selnum = 0;
@@ -637,7 +643,7 @@ static void setting_network_profile_delete_click_softkey_select_all_cb(
                /*current all are selected,so it need to unselect all after
                 * click the button */
                SETTING_TRACE("to unselect all");
-               check_list = ad->profile_del_list;
+               check_list = s_info.profile_del_list;
                un_selnum = 0;
                while (check_list) {
                        item_data = (Setting_GenGroupItem_Data *)eina_list_data_get(
@@ -652,11 +658,10 @@ static void setting_network_profile_delete_click_softkey_select_all_cb(
        } else {
                /*or else, to select all */
                SETTING_TRACE("to select all");
-               check_list = ad->profile_del_list;
+               check_list = s_info.profile_del_list;
                selnum = 0;
                while (check_list) {
-                       item_data = (Setting_GenGroupItem_Data *)eina_list_data_get(
-                                       check_list);
+                       item_data = (Setting_GenGroupItem_Data *)eina_list_data_get(check_list);
                        if (NULL == item_data)
                                continue;
 
@@ -667,20 +672,16 @@ static void setting_network_profile_delete_click_softkey_select_all_cb(
                un_selnum = 0;
        }
 
-       if (ad->navi_it_profile_del_list) {
-               Evas_Object *toolbar = elm_object_item_part_content_get(
-                               ad->navi_it_profile_del_list, "toolbar");
+       if (s_info.data_connection) {
+               Evas_Object *toolbar = elm_object_item_part_content_get(s_info.data_connection, "toolbar");
                Elm_Object_Item *it = elm_toolbar_last_item_get(toolbar);
                if (selnum != 0) {
                        char title[MAX_DISPLAY_NAME_LEN_ON_UI + 1] = { 0, };
-                       snprintf(title, MAX_DISPLAY_NAME_LEN_ON_UI,
-                                       _("IDS_ST_HEADER_PD_SELECTED"), selnum);
-                       elm_object_item_text_set(ad->navi_it_profile_del_list,
-                                       _(title));
+                       snprintf(title, MAX_DISPLAY_NAME_LEN_ON_UI, _("IDS_ST_HEADER_PD_SELECTED"), selnum);
+                       elm_object_item_text_set(s_info.data_connection, _(title));
                        elm_object_item_disabled_set(it, EINA_FALSE);
                } else {
-                       elm_object_item_text_set(ad->navi_it_profile_del_list,
-                                       _("IDS_ST_BODY_DELETE"));
+                       elm_object_item_text_set(s_info.data_connection, _("IDS_ST_BODY_DELETE"));
                        elm_object_item_disabled_set(it, EINA_TRUE);
                }
        }
index 1fd92f38acb2dfb8286cf3414b58ae471c0c17b8..be8ed50bbed6505c32a66288bc8e43235a082ab1 100644 (file)
@@ -22,6 +22,7 @@
 #include <setting-debug.h>
 #include <setting-cfg.h>
 #include "setting-network-select-network.h"
+#include "setting-network-connection-create.h"
 
 #define SETTING_NETWORK_PACKAGE_NAME "org.tizen.setting-network"
 #define MAX_ID_LEN 512
@@ -378,8 +379,8 @@ static void on_app_terminate(void *priv)
        if (ad->view_type_string)
                FREE(ad->view_type_string);
 
-       G_FREE(ad->ed_pxy_addr_desc);
-       G_FREE(ad->ed_pxy_port_desc);
+       setting_network_connection_create_terminate();
+
        FREE(ad->access_name);
        FREE(ad->con_name);
        FREE(ad->internet_apn_name);
@@ -421,40 +422,6 @@ static void on_app_terminate(void *priv)
        SETTING_TRACE_END;
 }
 
-static void __update_mobile_data_on_popup(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(NULL == data, "data is NULL");
-       SettingNetwork *ad = (SettingNetwork *)data;
-       ret_if(NULL == ad->popup_data_on);
-
-       elm_object_text_set(ad->popup_data_on, _(Data_packet_Popup_desc));
-}
-
-static void __update_mobile_data_off_popup(void *data)
-{
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(NULL == data, "data is NULL");
-       SettingNetwork *ad = (SettingNetwork *)data;
-       ret_if(NULL == ad->popup_data_off);
-
-       char *pop_info = NULL;
-       char *pop_title = NULL;
-
-       pop_info = (char *)g_strdup(
-                       _(KeyStr_Network_Mobile_Data_Has_Been_Disabled_Msg));
-       pop_title = (char *)g_strdup(_(KeyStr_Network_Turn_Off_Mobile_Data));
-
-       elm_object_text_set(ad->popup_data_off, _(pop_info));
-
-       if (pop_title) {
-               elm_object_part_text_set(ad->popup_data_off, "title,text",
-                               _(pop_title));
-       }
-       G_FREE(pop_title);
-       G_FREE(pop_info);
-}
-
 static void _lang_changed(app_event_info_h event_info, void *priv)
 {
        SETTING_TRACE_BEGIN;
@@ -492,8 +459,6 @@ static void _lang_changed(app_event_info_h event_info, void *priv)
        ret_if(!navi_it);
        elm_object_item_text_set(navi_it, _("IDS_ST_BODY_NETWORK"));
        /*update popup */
-       __update_mobile_data_on_popup(ad);
-       __update_mobile_data_off_popup(ad);
 }
 
 EXPORT_PUBLIC