network-create: Adopted to UI guide and fixed bugs 10/101310/2
authorBartlomiej Uliasz <b.uliasz@samsung.com>
Wed, 30 Nov 2016 17:29:55 +0000 (18:29 +0100)
committerBartlomiej Uliasz <b.uliasz@samsung.com>
Wed, 30 Nov 2016 17:32:15 +0000 (09:32 -0800)
Fixes issue TSAM-9980.
Adopted Cancel/Done buttons to UI guide. Fixed formatting. Code cleanup.

Change-Id: Id794801529a8a04bd251484665fb18c81c530442
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>
setting-applications/src/setting-applications-defaultapp.c
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-profile-delete.c
setting-network/src/setting-network.c
setting-smartmanager/smartmanager-battery/src/smartmanager-battery-main.c

index 2e1d1b161172e0140a708a468be4d6a634d26761..8aa59918e24475266f4af238085d006f3d137639 100755 (executable)
@@ -302,7 +302,7 @@ static int _view_create(void *cb)
        SettingApplications *ad = (SettingApplications *)cb;
        Evas_Object *genlist = elm_genlist_add(ad->md.layout);
        retvm_if(genlist == NULL, SETTING_RETURN_FAIL,
-                       "Cannot set scroller object as contento of layout");
+                       "Cannot set genlist object as content of layout");
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
        setting_push_to_naviframe_with_back_button(KeyStr_DefaultApplications,
index 43436b5d9d8f3e1adaab700ecbb687c1c8458f95..3209b6f0bfbc9ac63c15f9d5ea57656c6966df7a 100644 (file)
 #ifndef __SETTING_NETWORK_CONNECTION_CREATE_H__
 #define __SETTING_NETWORK_CONNECTION_CREATE_H__
 
-#include <setting-network.h>
-static void setting_network_connection_check_entry_empty(SettingNetwork *ad);
-static void setting_network_connection_display_auth_type(SettingNetwork * ad,
-               int auth_type);
-
-static void setting_network_connection_entry_changed_cb(void *data,
-               Evas_Object *obj, void *event_info);
-static void setting_network_connection_click_softkey_save_cb(void *data,
-               Evas_Object * obj, void *event_info);
-/*
- static void setting_network_connection_click_softkey_done_cb(void *data,
- Evas_Object *obj,
- void *event_info); */
-static void setting_network_connection_hide_input_pannel(void *data);
-static void setting_network_connection_entry_next_activated_cb(void *data,
-               Evas_Object *obj, void *event_info);
-
 #endif                         /* __SETTING_NETWORK_CONNECTION_CREATE_H__ */
index 9bdac6c243fa0f2db944b2e37aebc48da17e8959..98e60b74aecf76178345b40ddb18f79670f28e86 100644 (file)
@@ -360,7 +360,7 @@ extern setting_view setting_view_network_main;
 extern setting_view setting_view_network_select_network;
 extern setting_view setting_view_network_con;
 extern setting_view setting_view_network_con_list;
-extern setting_view setting_view_network_connection_create;
+extern setting_view setting_network_connection_create_view;
 extern setting_view setting_view_network_profile_delete;
 
 const char *setting_network_get_act_str(TelNetworkSystemType_t type);
index 35ac925367de4156989bb57d84ef7fa3a1d79cd6..9200223799090a99509c63e26a888df6921bb6d2 100644 (file)
@@ -327,7 +327,7 @@ static int setting_network_con_list_create(void *cb)
 
        Evas_Object *scroller = elm_genlist_add(ad->md.layout);
        retvm_if(scroller == NULL, SETTING_DRAW_ERR_FAIL_SCROLLER,
-                       "Cannot set scroller object  as contento of layout");
+                       "Cannot set genlist object as content of layout");
 
        const char *title = NULL;
        switch (ad->profile_service_type) {
@@ -428,7 +428,7 @@ static void setting_network_con_list_go_button_cb(void *data, Evas_Object *obj,
        FREE(ad->access_name);
        ad->access_name = strdup(item_data->keyStr2);
        setting_view_change(&setting_view_network_con_list,
-                       &setting_view_network_connection_create, ad);
+                       &setting_network_connection_create_view, ad);
 }
 
 #if 0
@@ -623,7 +623,7 @@ static void setting_network_con_list_item_Gendial_mouse_up_cb(void *data,
        FREE(ad->access_name);
        ad->access_name = strdup(list_item->keyStr2);
        setting_view_change(&setting_view_network_con_list,
-                       &setting_view_network_connection_create, ad);
+                       &setting_network_connection_create_view, ad);
 }
 void setting_network_con_list_chk_changed(void *data, Evas_Object *obj,
                void *event_info)
@@ -664,7 +664,7 @@ static void setting_network_con_list_click_softkey_create_cb(void *data,
 
        FREE(ad->access_name);
        setting_view_change(&setting_view_network_con_list,
-                       &setting_view_network_connection_create, ad);
+                       &setting_network_connection_create_view, ad);
        if (ctxpopup != NULL) {
                evas_object_del(ctxpopup);
                ctxpopup = NULL;
index 72d9d8dd730b9bff5a4960e5090bfa6710309300..1047060f89249b09150163868e4eb2ce6a5a5cfd 100755 (executable)
@@ -50,7 +50,7 @@ static void __setting_network_con_genlist_create(void *data)
        /* scroller is a genlist */
 
        /* [UI] Internet Connections */
-       SETTING_TRACE("ad->apn_internet:%d, ad->apn_MMS:%d", ad->apn_internet,
+       SETTING_TRACE("ad->apn_internet: %s, ad->apn_MMS: %s", ad->apn_internet,
                        ad->apn_MMS);
        ad->apn_internet = __get_profile_name(
                        CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET, ad);
@@ -75,8 +75,7 @@ static void __setting_network_con_genlist_create(void *data)
                                ad->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->apn_MMS,
-                               NULL);
+                               STR_SETTING_MMS_CONNECTIONS, ad->apn_MMS, NULL);
                ad->mms_conn = mms_conn;
        }
 #ifdef ENABLED_PREFERRED_NETWORKS
@@ -253,7 +252,7 @@ static int setting_network_con_create(void *cb)
 
        Evas_Object *scroller = elm_genlist_add(ad->md.layout);
        retvm_if(scroller == NULL, SETTING_DRAW_ERR_FAIL_SCROLLER,
-                       "Cannot set scroller object  as contento of layout");
+                       "Cannot set genlist object as content of layout");
        elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);
        elm_object_style_set(scroller, "dialogue");
        ad->connections_gl = scroller;
@@ -443,7 +442,7 @@ static void setting_network_con_item_Gendial_mouse_up_cb(void *data,
                ad->con_name = strdup(list_item->sub_desc);
                ad->access_name = strdup(list_item->sub_desc);
                ad->profile_service_type = list_item->chk_status;
-               setting_view_create(&setting_view_network_connection_create,
+               setting_view_create(&setting_network_connection_create_view,
                                ad);
        }
        SETTING_TRACE_END;
index 7ae8ab88bdf85ef1abc46dc56c976897a634c626..b9c1fb7413751ea08542dff6913f2a899ff06730 100755 (executable)
  */
 #include <setting-network-connection-create.h>
 #include <notification.h>
+#include <setting-network.h>
 
 #define MAX_PDP_APN_LEN_MAX 100
 #define MAX_PDP_AUTH_USERNAME_LEN_MAX 32
 #define MAX_PDP_AUTH_PASSWORD_LEN_MAX 32
 #define MAX_HOME_URL_LEN_MAX 512
 #define MAX_PROXY_LEN_MAX 64
-
-static int setting_network_connection_create(void *cb);
-static int setting_network_connection_destroy(void *cb);
-static int setting_network_connection_update(void *cb);
-static int setting_network_connection_cleanup(void *cb);
-static void setting_network_connection_click_softkey_back_ctx_cb(void *data,
-               Evas_Object *obj, void *event_info);
-static Eina_Bool __naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
-
-setting_view setting_view_network_connection_create = {
-               .create = setting_network_connection_create,
-               .destroy = setting_network_connection_destroy,
-               .update = setting_network_connection_update,
-               .cleanup = setting_network_connection_cleanup, };
-
 #define SUPPORT_EXPANDABLE_AUTHTYPE 1
 #define URL_HEAD "http://"
 #define INTERNET "IDS_ST_BODY_CONNECTIONSETTINGS_INTERNET"
 #define PLUS_MMS "+ MMS"
+
+static int _view_create(void *cb);
+static int _view_destroy(void *cb);
+static void _click_softkey_cancel_cb(void *data, Evas_Object *obj,
+               void *event_info);
+static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it);
+static void _check_entry_empty(SettingNetwork *ad);
+static void _display_auth_type(SettingNetwork * ad, int auth_type);
+static void _entry_changed_cb(void *data, Evas_Object *obj, void *event_info);
+static void _click_softkey_done_cb(void *data, Evas_Object * obj,
+               void *event_info);
+static void _hide_input_pannel(void *data);
+static void _entry_next_activated_cb(void *data, Evas_Object *obj,
+               void *event_info);
+
+setting_view setting_network_connection_create_view = {
+               .create = _view_create,
+               .destroy = _view_destroy,
+               .update = NULL,
+               .cleanup = NULL, };
+
 /* ***************************************************
  *
  *basic func
  *
  ***************************************************/
 
-void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
+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;
-       list_item->chk_status = elm_radio_value_get(obj); /*    for update */
+                       (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);
@@ -69,7 +76,7 @@ void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
 
        ret_if(NULL == data_subItem || NULL == data_parentItem);
 
-       data_parentItem->sub_desc = (char *) g_strdup(_(data_subItem->keyStr));
+       data_parentItem->sub_desc = (char *)g_strdup(_(data_subItem->keyStr));
        elm_object_item_data_set(data_parentItem->item, data_parentItem);
        elm_genlist_item_update(data_parentItem->item);
 
@@ -79,7 +86,7 @@ void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
                elm_genlist_item_expanded_set(ad->data_auth_type->item, FALSE);
                elm_genlist_item_update(ad->data_auth_type->item);
 
-               setting_network_connection_display_auth_type(
+               _display_auth_type(
                                data_parentItem->userdata,
                                list_item->chk_status);
        } else if (data_parentItem == ad->data_srv_type) {
@@ -87,15 +94,15 @@ void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
                        ad->srvType = data_subItem->chk_status;
                if (ad->srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
                        if (!ad->data_hm_url) {
-                               /*need home url */
+                               /* need home url */
                                ad->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,
-                                               setting_network_connection_entry_changed_cb);
+                                               (char *)ad->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;
@@ -114,7 +121,7 @@ void __sub_list_rd_change(void *data, Evas_Object *obj, void *event_info)
                                }
                        }
                } else {
-                       /*do need home-url */
+                       /* do need home-url */
                        if (ad->data_hm_url) {
                                elm_object_item_del(ad->data_hm_url->item);
                                ad->data_hm_url = NULL;
@@ -150,20 +157,20 @@ static void _create_new_cellular_internet_profile(SettingNetwork *ad)
        FREE(profile_name);
 }
 
-void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
+static void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        int ret;
 
        /* error check */
        retm_if(event_info == NULL, "Invalid argument: event info is NULL");
-       Elm_Object_Item *subitem = (Elm_Object_Item *) event_info;
+       Elm_Object_Item *subitem = (Elm_Object_Item *)event_info;
        elm_genlist_item_selected_set(subitem, 0);
 
        Setting_GenGroupItem_Data *data_subItem = elm_object_item_data_get(
                        subitem);
        Setting_GenGroupItem_Data *data_parentItem =
-                       (Setting_GenGroupItem_Data *) data;
+                       (Setting_GenGroupItem_Data *)data;
        ret_if(NULL == data_subItem || NULL == data_parentItem);
 
        SettingNetwork *ad = data_parentItem->userdata;
@@ -172,16 +179,16 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
        int chk_status = data_subItem->chk_status;
        elm_radio_value_set(data_subItem->rgd, chk_status);
 
-       data_parentItem->sub_desc = (char *) g_strdup(_(data_subItem->keyStr));
+       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);
 
-               setting_network_connection_display_auth_type(ad, chk_status);
+               _display_auth_type(ad, chk_status);
 
-               /*remove network mode popup */
+               /* remove network mode popup */
                if (ad->popup_auth_type) {
                        evas_object_del(ad->popup_auth_type);
                        ad->popup_auth_type = NULL;
@@ -192,15 +199,15 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                        ad->srvType = data_subItem->chk_status;
                if (ad->srvType != CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET) {
                        if (!ad->data_hm_url) {
-                               /*need home url */
+                               /* need home url */
                                ad->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,
-                                               setting_network_connection_entry_changed_cb);
+                                               (char *)ad->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;
@@ -218,7 +225,7 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                                }
                        }
                } else {
-                       /*do need home-url */
+                       /* do need home-url */
                        if (ad->data_hm_url) {
                                elm_object_item_del(ad->data_hm_url->item);
                                ad->data_hm_url = NULL;
@@ -245,7 +252,7 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                                        ad->sel_profile_h);
                }
 
-               /*remove network mode popup */
+               /* remove network mode popup */
                if (ad->popup_pdn_type) {
                        evas_object_del(ad->popup_pdn_type);
                        ad->popup_pdn_type = NULL;
@@ -271,7 +278,7 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
                                        ad->sel_profile_h);
                }
 
-               /*remove network mode popup */
+               /* remove network mode popup */
                if (ad->popup_pdn_type) {
                        evas_object_del(ad->popup_pdn_type);
                        ad->popup_pdn_type = NULL;
@@ -279,7 +286,7 @@ void __sub_list_sel_cb(void *data, Evas_Object *obj, void *event_info)
        }
 }
 
-void __popup_del(void *data, Evas_Object *obj, void *event_info)
+static void __popup_del(void *data, Evas_Object *obj, void *event_info)
 {
        SettingNetwork *ad = data;
 
@@ -299,7 +306,7 @@ static void __create_auth_type_popup(void *data, Evas_Object *obj,
 {
        ret_if(NULL == data || NULL == event_info);
        SETTING_TRACE_BEGIN;
-       SettingNetwork *ad = (SettingNetwork *) data;
+       SettingNetwork *ad = (SettingNetwork *)data;
        Elm_Object_Item *parentItem = event_info; /* parent item */
        elm_genlist_item_selected_set(parentItem, 0);
        Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(
@@ -386,7 +393,7 @@ static void __create_pdn_type_popup(void *data, Evas_Object *obj,
 {
        ret_if(NULL == data || NULL == event_info);
        SETTING_TRACE_BEGIN;
-       SettingNetwork *ad = (SettingNetwork *) data;
+       SettingNetwork *ad = (SettingNetwork *)data;
        Elm_Object_Item *parentItem = event_info; /* parent item */
        elm_genlist_item_selected_set(parentItem, 0);
        Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(
@@ -476,7 +483,7 @@ static void __setting_network_connection_exp_cb(void *data, Evas_Object *obj,
 {
        ret_if(NULL == data || NULL == event_info);
        SETTING_TRACE_BEGIN;
-       SettingNetwork *ad = (SettingNetwork *) data;
+       SettingNetwork *ad = (SettingNetwork *)data;
        Elm_Object_Item *parentItem = event_info; /* parent item */
        Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(
                        parentItem); /* parent data */
@@ -486,7 +493,7 @@ static void __setting_network_connection_exp_cb(void *data, Evas_Object *obj,
 
        if (data_parentItem == ad->data_auth_type) {
                rgd = elm_radio_add(scroller);
-               /*elm_object_style_set(rgd, "list"); */
+               /* elm_object_style_set(rgd, "list"); */
                elm_radio_value_set(rgd, -1);
 
                SETTING_TRACE("CONNECTION_CELLULAR_AUTH_TYPE_NONE : %d: ",
@@ -559,15 +566,16 @@ static Eina_Bool __connection_idler(void *data)
        SETTING_TRACE_BEGIN;
        retv_if(!data, FALSE);
        SettingNetwork *ad = data;
-       /*__genlist_disable_set(ad->scl_edit, TRUE); */
-       setting_network_connection_hide_input_pannel(ad);
+       /* __genlist_disable_set(ad->scl_edit, TRUE); */
+       _hide_input_pannel(ad);
        return FALSE;
 }
-void __get_connection_info(void *cb)
+
+static void __get_connection_info(void *cb)
 {
        SETTING_TRACE_BEGIN;
        ret_if(cb == NULL);
-       SettingNetwork *ad = (SettingNetwork *) cb;
+       SettingNetwork *ad = (SettingNetwork *)cb;
 
        G_FREE(ad->ed_profile_name_desc);
        G_FREE(ad->ed_acs_name_desc);
@@ -595,7 +603,7 @@ void __get_connection_info(void *cb)
 
        SETTING_TRACE("con_name_utf8:%s", con_name_utf8);
 
-       /*match with the correct profile */
+       /* match with the correct profile */
        connection_profile_iterator_h profile_iter = NULL;
        connection_profile_h profile_h = NULL;
        char *profile_name = NULL;
@@ -616,7 +624,7 @@ void __get_connection_info(void *cb)
        int cnt = 0;
        bool found = FALSE;
        while (connection_profile_iterator_has_next(profile_iter)) {
-               /*reset and release.. */
+               /* reset and release.. */
                G_FREE(apn);
                G_FREE(profile_id);
                G_FREE(profile_name);
@@ -642,10 +650,10 @@ void __get_connection_info(void *cb)
                if (CONNECTION_PROFILE_TYPE_CELLULAR != profile_type)
                        continue;
 
-               /*match with ServiceType */
+               /* match with ServiceType */
                if (ServiceType == service_type) {
                        if (ServiceType == CONNECTION_CELLULAR_SERVICE_TYPE_MMS) {
-                               /*for MMS,it just have one profile */
+                               /* for MMS,it just have one profile */
                                ad->sel_profile_h = profile_h;
                                found = TRUE;
                                break;
@@ -663,7 +671,7 @@ void __get_connection_info(void *cb)
        }
        FREE(con_name_utf8);
        ad->is_editable = TRUE;
-       if (found) { /*found sucessfully */
+       if (found) { /* found sucessfully */
                SETTING_TRACE("found the following record:");
                SETTING_TRACE("\tapn:%s", apn);
                SETTING_TRACE("\tprofile_id:%s", profile_id);
@@ -773,7 +781,7 @@ void __get_connection_info(void *cb)
                char *full_addr = NULL;
                char *addr = NULL;
                char *port = NULL;
-               /*Fix the Port 'NULL' issue when enter connection view
+               /* Fix the Port 'NULL' issue when enter connection view
                 * repeatly.. */
                connection_profile_get_proxy_address(ad->sel_profile_h,
                                CONNECTION_ADDRESS_FAMILY_IPV4, &full_addr);
@@ -782,7 +790,7 @@ void __get_connection_info(void *cb)
                safeCopyStr(ProxyAddr, full_addr, MAX_HOME_URL_LEN_MAX);
                G_FREE(full_addr);
 
-               /*several real format after removing "http://": */
+               /* several real format after removing "http://": */
                /*      ":80", "1.1.1.1:80","1.1.1.1: ", "127.0.0.1/",
                 * "127.0.0.1" */
                full_addr = ProxyAddr;
@@ -791,20 +799,20 @@ void __get_connection_info(void *cb)
                        full_addr += url_head_len;
 
                addr = strsep(&full_addr, ":");
-               if (NULL == full_addr) { /*format like "http://127.0.0.1/" or
+               if (NULL == full_addr) { /* format like "http://127.0.0.1/" or
                "http://127.0.0.1" */
                        SETTING_TRACE("NULL == full_addr");
                        addr = strsep(&addr, "/");
                }
 
                ad->ed_pxy_addr_desc = NULL;
-               /*proxy address support not only ip but also url, need not
+               /* proxy address support not only ip but also url, need not
                 * check the format */
-               /*bool is_ip = is_ip_string(addr, &tmp); */
+               /* bool is_ip = is_ip_string(addr, &tmp); */
                if (!isEmptyStr(addr)) {
                        ad->ed_pxy_addr_desc = g_strdup(addr);
                        port = strsep(&full_addr, "/");
-               } else { /*invalid format,let addr and port to be NULL. */
+               } else { /* invalid format,let addr and port to be NULL. */
                        addr = NULL;
                }
                SETTING_TRACE("addr:%s", addr);
@@ -825,10 +833,10 @@ void __get_connection_info(void *cb)
                ad->srvType = CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET;
        }
 
-       /*release the memory.. */
+       /* release the memory.. */
        G_FREE(apn);
        G_FREE(profile_id);
-       /*G_FREE(profile_name); */
+       /* G_FREE(profile_name); */
        return;
 }
 
@@ -837,11 +845,11 @@ static void __network_max_len_reached(void *data, Evas_Object *obj,
 {
        SETTING_TRACE_BEGIN;
        retm_if(data == NULL, "Data parameter is NULL");
-       /*notify only when entry is being focused on. */
+       /* notify only when entry is being focused on. */
        retm_if(!elm_object_focus_get(obj), "Entry is not focused");
 
        Setting_GenGroupItem_Data *list_item =
-                       (Setting_GenGroupItem_Data *) data;
+                       (Setting_GenGroupItem_Data *)data;
        list_item->maxLengthReachFlag = true;
 
        SETTING_TRACE("list_item->enterKeyPressFlag : %d",
@@ -857,14 +865,14 @@ static void __network_max_len_reached(void *data, Evas_Object *obj,
 /*
  * Entry - activated callback (When 'Next' key in SIP touched)
  */
-static void setting_network_connection_entry_next_activated_cb(void *data,
+static void _entry_next_activated_cb(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 *)data;
        SettingNetwork *ad = list_item->userdata;
 
        Evas_Object *pObj_NextEntry = NULL;
@@ -911,7 +919,7 @@ static void _init_context(void *cb)
        SETTING_TRACE_BEGIN;
        ret_if(cb == NULL);
 
-       SettingNetwork *ad = (SettingNetwork *) cb;
+       SettingNetwork *ad = (SettingNetwork *)cb;
 
        /* connection intializes */
        ad->data_profile_name = NULL;
@@ -924,136 +932,28 @@ static void _init_context(void *cb)
        ad->data_hm_url = NULL;
 }
 
-/*////////////////////////////////////////////////////////////////////////// */
-static Evas_Object *ctxpopup;
-
-static void ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
-               void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       evas_object_del(ctxpopup);
-       ctxpopup = NULL;
-}
-
-static void move_more_ctxpopup(Evas_Object *ctxpopup)
+/* ////////////////////////////////////////////////////////////////////////// */
+static int _view_create(void *cb)
 {
        SETTING_TRACE_BEGIN;
-       Evas_Object *win;
-       Evas_Coord w, h;
-       int pos = -1;
-
-       /* We convince the top widget is a window */
-       win = elm_object_top_widget_get(ctxpopup);
-       elm_win_screen_size_get(win, NULL, NULL, &w, &h);
-       pos = elm_win_rotation_get(win);
-
-       switch (pos) {
-       case 0:
-       case 180:
-               evas_object_move(ctxpopup, (w / 2), h);
-               break;
-       case 90:
-               evas_object_move(ctxpopup, (h / 2), w);
-               break;
-       case 270:
-               evas_object_move(ctxpopup, (h / 2), w);
-               break;
-       }
-}
-
-static void naviframe_resize_cb(void *data, Evas *e, Evas_Object *obj,
-               void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *ctxpopup = data;
-       move_more_ctxpopup(ctxpopup);
-}
-
-static void more_ctxpopup_del_cb(void *data, Evas *e, Evas_Object *obj,
-               void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *nf = data;
-       evas_object_event_callback_del_full(nf, EVAS_CALLBACK_RESIZE,
-                       naviframe_resize_cb, ctxpopup);
-}
-
-static void win_rotation_changed_cb(void *data, Evas_Object *obj,
-               void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       Evas_Object *ctxpopup = data;
-       move_more_ctxpopup(ctxpopup);
-}
-
-/* Icon + Text (More button style : Naviframe Toolbar) */
-static void create_ctxpopup_more_button_cb(void *data, Evas_Object *obj,
-               void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       SettingNetwork *ad = (SettingNetwork *) data;
-       /*Evas_Object *it_obj; */
-       Evas_Object *nf = ad->md.naviframe;
-       Evas_Object *win;
-       /*Elm_Object_Item *it; */
-
-       if (ctxpopup != NULL)
-               evas_object_del(ctxpopup);
-
-       ctxpopup = elm_ctxpopup_add(nf);
-       elm_ctxpopup_auto_hide_disabled_set(ctxpopup, EINA_TRUE);
-       elm_object_style_set(ctxpopup, "more/default");
-       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK,
-                       eext_ctxpopup_back_cb, NULL);
-       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_MORE,
-                       eext_ctxpopup_back_cb, NULL);
-       evas_object_smart_callback_add(ctxpopup, "dismissed",
-                       ctxpopup_dismissed_cb, NULL);
-       evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL,
-                       more_ctxpopup_del_cb, nf);
-       evas_object_event_callback_add(nf, EVAS_CALLBACK_RESIZE,
-                       naviframe_resize_cb, ctxpopup);
-
-       /* We convince the top widget is a window */
-       win = elm_object_top_widget_get(nf);
-       evas_object_smart_callback_add(win, "rotation,changed",
-                       win_rotation_changed_cb, ctxpopup);
-
-       /*------------------------------------------------------------------ */
-       elm_ctxpopup_item_append(ctxpopup, _("IDS_ST_BODY_SAVE"), NULL,
-                       setting_network_connection_click_softkey_save_cb, ad);
-       elm_ctxpopup_item_append(ctxpopup, _("IDS_ST_BUTTON_CANCEL_ABB"), NULL,
-                       setting_network_connection_click_softkey_back_ctx_cb,
-                       ad);
-       /*------------------------------------------------------------------ */
-
-       elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_UP,
-                       ELM_CTXPOPUP_DIRECTION_UNKNOWN,
-                       ELM_CTXPOPUP_DIRECTION_UNKNOWN,
-                       ELM_CTXPOPUP_DIRECTION_UNKNOWN);
-       move_more_ctxpopup(ctxpopup);
-       evas_object_show(ctxpopup);
-}
-/*////////////////////////////////////////////////////////////////////////// */
-
-static int setting_network_connection_create(void *cb)
-{
-       SETTING_TRACE_BEGIN;
-       retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-
-       SettingNetwork *ad = (SettingNetwork *) cb;
+       Evas_Object *lbtn = NULL;
+       Evas_Object *rbtn = NULL;
+       SettingNetwork *ad = (SettingNetwork *)cb;
+       retv_if(!ad, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
        setting_retvm_if(!ad->con_name, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER,
                        "!ad->con_name");
 
-       Evas_Object *scroller = elm_genlist_add(ad->md.layout);
-       retvm_if(scroller == NULL, SETTING_DRAW_ERR_FAIL_SCROLLER,
-                       "Cannot set scroller object  as contento of layout");
-       elm_genlist_mode_set(scroller, ELM_LIST_COMPRESS);
-       elm_genlist_clear(scroller); /* first to clear list */
-       evas_object_smart_callback_add(scroller, "realized", __gl_realized_cb,
+       /* create genlist */
+       Evas_Object *genlist = elm_genlist_add(ad->md.layout);
+       retvm_if(genlist == NULL, SETTING_DRAW_ERR_FAIL_SCROLLER,
+                       "Cannot set genlist object  as content of layout");
+       elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
+       elm_genlist_clear(genlist); /* first to clear list */
+       elm_genlist_item_select_mode_set(genlist,
+                       ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+       evas_object_smart_callback_add(genlist, "realized", __gl_realized_cb,
                        NULL);
-
-       ad->con_create_gl = scroller;
+       ad->con_create_gl = genlist;
 
        _init_context(ad);
 
@@ -1070,38 +970,36 @@ static int setting_network_connection_create(void *cb)
                break;
        }
 
-       ad->navi_it = setting_push_to_naviframe_with_back_button(_(title),
-                       NULL, __naviframe_item_pop_cb, ad, scroller,
-                       ad->md.naviframe);
+       /* push genlist to naviframe with buttons */
+       lbtn = setting_create_button(ad->md.naviframe,
+                       _("IDS_MSG_ACBUTTON_CANCEL_ABB"),
+                       "naviframe/title_left",
+                       _click_softkey_cancel_cb, ad);
+       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,
+                       _(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);
 
        evas_object_data_set(ad->md.naviframe, "sip.naviframe.title_obj", "*");
 
-       /* Add ctx popup handler */
-       Evas_Object *btn = elm_button_add(ad->md.naviframe);
-       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, "toolbar_more_btn", btn);
-
-       retv_if(!ad->navi_it, SETTING_RETURN_FAIL);
        ad->has_form_changed = FALSE;
 
-       setting_enable_expandable_genlist(scroller, ad,
+       setting_enable_expandable_genlist(genlist, ad,
                        __setting_network_connection_exp_cb,
                        NULL);
        __get_connection_info(ad);
 
-       /*Elm_Object_Item *item = NULL;*/
-
-       /*new a profile,need to select the "Service type" */
+       /* 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(
-                               scroller, &itc_2text_3_parent,
+                               genlist, &itc_2text_3_parent,
                                NULL, NULL, SWALLOW_Type_INVALID,
                                _("IDS_MSGF_BODY_SERVICE_TYPE"),
                                _("IDS_ST_BODY_INTERNET_CONNECTION"));
-               /* ad->data_auth_type->int_slp_setting_binded =
-                * INT_SLP_SETTING_INVALID; */
                if (ad->data_srv_type) {
                        ad->data_srv_type->userdata = ad;
                        __BACK_POINTER_SET(ad->data_srv_type);
@@ -1120,26 +1018,26 @@ static int setting_network_connection_create(void *cb)
        if (!isEmptyStr(ad->ed_profile_name_desc)) {
                /* Display */
                ad->data_profile_name = setting_create_Gendial_field_def(
-                               scroller, &itc_multiline_2text,
+                               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 *)ad->ed_profile_name_desc, /* sub_desk*/
                                NULL);
        } else {
                /* Editor */
                ad->data_profile_name = setting_create_Gendial_field_entry_with_return_key(
-                               scroller, &itc_editfield, NULL, ad,
+                               genlist, &itc_editfield, NULL, ad,
                                SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0, "IDS_ST_BODY_PROFILE_NAME",
-                               (char *) ad->ed_profile_name_desc,
-                               setting_network_connection_entry_changed_cb,
+                               (char *)ad->ed_profile_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_NEXT,
-                               setting_network_connection_entry_next_activated_cb,
+                               _entry_next_activated_cb,
                                NULL);
        }
 
@@ -1148,15 +1046,15 @@ static int setting_network_connection_create(void *cb)
                ad->data_profile_name->userdata = ad;
                ad->data_profile_name->window = ad->md.window;
                ad->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); */
-               /*not create(first time) */
+               /* there is no CAPI to set profile name,so disable it: */
+               /* setting_disable_genlist_item(ad->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);
 
-                       /*setting_disable_genlist_item(
+                       /* setting_disable_genlist_item(
                         * ad->data_profile_name->item); */
                }
        } else {
@@ -1165,11 +1063,11 @@ static int setting_network_connection_create(void *cb)
 
        /* [UI] Access point name */
        ad->data_acs_name = setting_create_Gendial_field_entry_with_return_key(
-                       scroller, &itc_editfield, NULL, ad,
+                       genlist, &itc_editfield, NULL, ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
                        NULL, NULL, 0, "IDS_DLNA_BODY_ACCESS_POINT_NAME",
-                       (char *) ad->ed_acs_name_desc,
-                       setting_network_connection_entry_changed_cb,
+                       (char *)ad->ed_acs_name_desc,
+                       _entry_changed_cb,
                        __network_max_len_reached,
                        ELM_INPUT_PANEL_LAYOUT_NORMAL,
                        FALSE, FALSE, 64, 64, NULL, NULL,
@@ -1184,11 +1082,11 @@ static int setting_network_connection_create(void *cb)
        }
 
        /* [UI] Authentication type */
-       ad->data_auth_type = setting_create_Gendial_field_def(scroller,
+       ad->data_auth_type = 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);
+                       (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);
@@ -1202,11 +1100,11 @@ static int setting_network_connection_create(void *cb)
        if (CONNECTION_CELLULAR_AUTH_TYPE_NONE != ad->chkType) {
                /* [UI] User ID */
                ad->data_user_name = setting_create_Gendial_field_entry_with_return_key(
-                               scroller, &itc_editfield,
+                               genlist, &itc_editfield,
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0,
-                               KeyStr_UserID, (char *) ad->ed_user_name_desc,
-                               setting_network_connection_entry_changed_cb,
+                               KeyStr_UserID, (char *)ad->ed_user_name_desc,
+                               _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_NORMAL,
                                FALSE, FALSE,
@@ -1214,7 +1112,7 @@ static int setting_network_connection_create(void *cb)
                                MAX_PDP_AUTH_USERNAME_LEN_MAX,
                                NULL, NULL,
                                ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT,
-                               setting_network_connection_entry_next_activated_cb,
+                               _entry_next_activated_cb,
                                NULL);
                if (ad->data_user_name) {
                        __BACK_POINTER_SET(ad->data_user_name);
@@ -1227,11 +1125,11 @@ static int setting_network_connection_create(void *cb)
 
                /* [UI] Password */
                ad->data_pwd = setting_create_Gendial_field_entry_with_return_key(
-                               scroller, &itc_editfield,
+                               genlist, &itc_editfield,
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0, "IDS_ST_BODY_PASSWORD",
-                               (char *) ad->ed_pwd_desc,
-                               setting_network_connection_entry_changed_cb,
+                               (char *)ad->ed_pwd_desc,
+                               _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_NORMAL,
                                TRUE, FALSE,
@@ -1239,7 +1137,7 @@ static int setting_network_connection_create(void *cb)
                                MAX_PDP_AUTH_USERNAME_LEN_MAX,
                                NULL, NULL,
                                ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT,
-                               setting_network_connection_entry_next_activated_cb,
+                               _entry_next_activated_cb,
                                NULL);
                if (ad->data_pwd) {
                        __BACK_POINTER_SET(ad->data_pwd);
@@ -1256,16 +1154,16 @@ static int setting_network_connection_create(void *cb)
 
        /* [UI] Proxy address */
        ad->data_pxy_addr = setting_create_Gendial_field_entry_with_return_key(
-                       scroller, &itc_editfield, NULL, ad,
+                       genlist, &itc_editfield, NULL, ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
                        NULL, NULL, 0,
                        "IDS_ST_BODY_CONNECTIONSETTINGS_PROXY_ADDRESS",
-                       (char *) ad->ed_pxy_addr_desc,
-                       setting_network_connection_entry_changed_cb,
+                       (char *)ad->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,
-                       setting_network_connection_entry_next_activated_cb,
+                       _entry_next_activated_cb,
                        NULL);
        if (ad->data_pxy_addr) {
                __BACK_POINTER_SET(ad->data_pxy_addr);
@@ -1283,18 +1181,18 @@ static int setting_network_connection_create(void *cb)
 
        if (!safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS)) {
                type = ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
-               cbFunc = setting_network_connection_entry_next_activated_cb;
-               /*SETTING_TRACE_ERROR("Enter here hwy ---> ad->con_name :
+               cbFunc = _entry_next_activated_cb;
+               /* SETTING_TRACE_ERROR("Enter here hwy ---> ad->con_name :
                 *  %s ", ad->con_name); */
        }
 
        /* [UI] Proxy port */
        ad->data_pxy_port = setting_create_Gendial_field_entry_with_return_key(
-                       scroller, &itc_editfield, NULL, ad,
+                       genlist, &itc_editfield, NULL, ad,
                        SWALLOW_Type_LAYOUT_EDITFIELD,
                        NULL, NULL, 0, "IDS_ST_BODY_PROXY_PORT",
-                       (char *) ad->ed_pxy_port_desc,
-                       setting_network_connection_entry_changed_cb,
+                       (char *)ad->ed_pxy_port_desc,
+                       _entry_changed_cb,
                        __network_max_len_reached,
                        ELM_INPUT_PANEL_LAYOUT_NUMBERONLY,
                        FALSE, FALSE, 0, 5, "0123456789", NULL, type, cbFunc,
@@ -1313,11 +1211,11 @@ static int setting_network_connection_create(void *cb)
        if (!safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS)) {
                /* [UI] Home URL */
                ad->data_hm_url = setting_create_Gendial_field_entry_with_return_key(
-                               scroller, &itc_editfield,
+                               genlist, &itc_editfield,
                                NULL, ad, SWALLOW_Type_LAYOUT_EDITFIELD,
                                NULL, NULL, 0, "IDS_ST_BODY_HOME_URL",
-                               (char *) ad->ed_hm_url_desc,
-                               setting_network_connection_entry_changed_cb,
+                               (char *)ad->ed_hm_url_desc,
+                               _entry_changed_cb,
                                __network_max_len_reached,
                                ELM_INPUT_PANEL_LAYOUT_URL,
                                FALSE, FALSE, 0, 521, NULL, NULL,
@@ -1335,29 +1233,29 @@ static int setting_network_connection_create(void *cb)
        }
 
        /* [UI] APN protocol */
-       ad->data_pdn_type = setting_create_Gendial_field_def(scroller,
+       ad->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);
+                       (char *)ad->ed_pdn_type_desc, NULL);
        if (ad->data_pdn_type)
                ad->data_pdn_type->userdata = ad;
        else
                SETTING_TRACE_ERROR("ad->data_pdn_type is NULL");
 
        /* [UI] APN roaming protocol */
-       ad->data_roam_pdn_type = setting_create_Gendial_field_def(scroller,
+       ad->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);
+                       (char *)ad->ed_roam_pdn_type_desc, NULL);
        if (ad->data_roam_pdn_type)
                ad->data_roam_pdn_type->userdata = ad;
        else
                SETTING_TRACE_ERROR("ad->data_roam_pdn_type is NULL");
 
-       setting_view_network_connection_create.is_create = 1;
-       ad->scl_edit = scroller;
+       setting_network_connection_create_view.is_create = 1;
+       ad->scl_edit = genlist;
 
        SETTING_TRACE("==> ad->is_editable:%d", ad->is_editable);
        if (!ad->is_editable) {
@@ -1387,24 +1285,24 @@ static int setting_network_connection_create(void *cb)
        return SETTING_RETURN_SUCCESS;
 }
 
-static int setting_network_connection_destroy(void *cb)
+static int _view_destroy(void *cb)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(cb == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       SettingNetwork *ad = (SettingNetwork *) cb;
+       SettingNetwork *ad = (SettingNetwork *)cb;
 
        evas_object_data_set(ad->md.naviframe, "sip.naviframe.title_obj", NULL);
        ad->navi_it = NULL;
        ad->bottom_btn = NULL;
        ad->back_btn = NULL;
-       /*manager separatly, */
+       /* manager separatly, */
        if (ad->l_button) {
                evas_object_del(ad->l_button);
                ad->l_button = NULL;
        }
-       /*if (ad->m_button)
+       /* if (ad->m_button)
         {
         evas_object_del(ad->m_button);
         ad->m_button = NULL;
@@ -1413,7 +1311,7 @@ static int setting_network_connection_destroy(void *cb)
                evas_object_del(ad->r_button);
                ad->r_button = NULL;
        }
-       /*FREE(ad->con_name); */
+       /* 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);
@@ -1426,105 +1324,17 @@ static int setting_network_connection_destroy(void *cb)
 
        elm_naviframe_item_pop(ad->md.naviframe);
 
-       setting_view_network_connection_create.is_create = 0;
-       return SETTING_RETURN_SUCCESS;
-}
-
-static int setting_network_connection_update(void *cb)
-{
-       SETTING_TRACE_BEGIN;
+       setting_network_connection_create_view.is_create = 0;
        return SETTING_RETURN_SUCCESS;
 }
 
-static int setting_network_connection_cleanup(void *cb)
-{
-       return setting_network_connection_destroy(cb);
-}
-
-/* ***************************************************
- *
- *general func
- *
- ***************************************************/
-bool need_check_default_profile(void *data,
-               connection_cellular_service_type_e inputtype)
-{
-       retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
-       SettingNetwork *ad = (SettingNetwork *) data;
-       SETTING_TRACE("inputtype:%d", inputtype);
-       connection_profile_iterator_h profile_iter = NULL;
-       connection_profile_h profile_h = NULL;
-       int rv = connection_get_profile_iterator(ad->connection,
-                       CONNECTION_ITERATOR_TYPE_REGISTERED, &profile_iter);
-       if (rv != CONNECTION_ERROR_NONE) {
-               SETTING_TRACE_ERROR("Fail to get profile iterator [%d]", rv);
-               return SETTING_RETURN_FAIL;
-       }
-
-       int cnt = 0;
-       connection_profile_type_e profile_type =
-                       CONNECTION_PROFILE_TYPE_CELLULAR;
-       connection_cellular_service_type_e service_type =
-                       CONNECTION_CELLULAR_SERVICE_TYPE_UNKNOWN;
-       while (connection_profile_iterator_has_next(profile_iter)) {
-               if (cnt >= MAX_PROFILE_NUM)
-                       break;
-
-               cnt++;
-               if (connection_profile_iterator_next(profile_iter, &profile_h)
-                               != CONNECTION_ERROR_NONE) {
-                       SETTING_TRACE_ERROR("Fail to get profile handle");
-                       break;
-               }
-
-               if (connection_profile_get_type(profile_h, &profile_type)
-                               != CONNECTION_ERROR_NONE) {
-                       SETTING_TRACE_ERROR("Fail to get profile type");
-                       continue;
-               }
-               if (connection_profile_get_cellular_service_type(profile_h,
-                               &service_type) != CONNECTION_ERROR_NONE) {
-                       SETTING_TRACE_ERROR("Fail to get service type");
-                       continue;
-               }
-               if (CONNECTION_PROFILE_TYPE_CELLULAR == profile_type
-                               && inputtype == service_type) {
-                       char *apn = NULL;
-                       connection_profile_get_cellular_apn(profile_h, &apn);
-                       SETTING_TRACE("Matched:%s", apn);
-                       FREE(apn);
-                       return FALSE;
-               }
-       }
-       return TRUE;
-}
-
-/**
- * popup - timeout and 'ok' callback
- */
-static void __setting_network_connection_popup_rsp_cb(void *data,
-               Evas_Object *obj, void *event_info)
-{
-
-       SETTING_TRACE_BEGIN;
-       setting_retm_if(obj == NULL, "obj parameter is NULL");
-       setting_retm_if(data == NULL, "Data parameter is NULL");
-       /*SettingNetwork *ad = (SettingNetwork *) data; */
-
-       /* remove ctxpopup */
-       if (ctxpopup != NULL) {
-               evas_object_del(ctxpopup);
-               ctxpopup = NULL;
-       }
-}
-
 static int __save_connection(void *data)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
-       SettingNetwork *ad = (SettingNetwork *) data;
+       SettingNetwork *ad = (SettingNetwork *)data;
        const char *profile_name = NULL;
        const char *acs_name = NULL;
        const char *usr_name = NULL;
@@ -1580,8 +1390,7 @@ static int __save_connection(void *data)
                snprintf(name, sizeof(name), _("IDS_ST_POP_ENTER_PS"),
                                _("IDS_ST_BODY_PROFILE_NAME"));
 
-               setting_create_popup(ad, ad->md.window, NULL, _(name),
-                               __setting_network_connection_popup_rsp_cb,
+               setting_create_popup(ad, ad->md.window, NULL, _(name), NULL,
                                2/*SECONDS*/, false, false, 0);
                FREE(acs_name);
                FREE(profile_name);
@@ -1597,8 +1406,7 @@ static int __save_connection(void *data)
                char name[MAX_DISPLAY_NAME_LEN_ON_UI + 1] = { 0, };
                snprintf(name, sizeof(name), _("IDS_ST_POP_ENTER_PS"),
                                _("IDS_DLNA_BODY_ACCESS_POINT_NAME"));
-               setting_create_popup(ad, ad->md.window, NULL, _(name),
-                               __setting_network_connection_popup_rsp_cb,
+               setting_create_popup(ad, ad->md.window, NULL, _(name), NULL,
                                2/*SECONDS*/, false, false, 0);
                FREE(acs_name);
                FREE(profile_name);
@@ -1608,62 +1416,62 @@ static int __save_connection(void *data)
                FREE(port);
                return SETTING_DNET_RETURN_NULL_ACCESS_NAME;
        }
-       /*if (test_update_cellular_info(profile) == -1) */
-       bool add_flag = FALSE;/*add a new profile */
+       /* if (test_update_cellular_info(profile) == -1) */
+       bool add_flag = FALSE;/* add a new profile */
        connection_profile_h con_info = NULL;
-       connection_profile_h con_info_2 = NULL;/*for MMS */
+       connection_profile_h con_info_2 = NULL;/* for MMS */
        if (ad->sel_profile_h) {
                con_info = ad->sel_profile_h;
                if (0 != safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS)
                                && 0 != safeStrCmp(ad->con_name,
                                                "IDS_ST_BODY_INTERNET_CONNECTION")) {
-                       /*need to change con_name */
-                       /*FREE(ad->con_name); */
-                       /*ad->con_name = strdup(acs_name); */
+                       /* need to change con_name */
+                       /* FREE(ad->con_name); */
+                       /* ad->con_name = strdup(acs_name); */
                }
        } else {
                if (!safeStrCmp(ad->con_name, STR_SETTING_MMS_CONNECTIONS)) {
-                       (void) connection_profile_create(
+                       (void)connection_profile_create(
                                        CONNECTION_PROFILE_TYPE_CELLULAR,
                                        _(profile_name), &con_info);
-                       (void) connection_profile_set_cellular_service_type(
+                       (void)connection_profile_set_cellular_service_type(
                                        con_info,
                                        CONNECTION_CELLULAR_SERVICE_TYPE_MMS);
                } else if (!safeStrCmp(ad->con_name,
                                "IDS_ST_BODY_INTERNET_CONNECTION")) {
-                       (void) connection_profile_create(
+                       (void)connection_profile_create(
                                        CONNECTION_PROFILE_TYPE_CELLULAR,
                                        _(profile_name), &con_info);
-                       (void) connection_profile_set_cellular_service_type(
+                       (void)connection_profile_set_cellular_service_type(
                                        con_info,
                                        CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET);
                } else {
-                       /*need to change con_name */
-                       /*FREE(ad->con_name); */
-                       /*ad->con_name = strdup(acs_name); */
-                       (void) connection_profile_create(
+                       /* need to change con_name */
+                       /* FREE(ad->con_name); */
+                       /* ad->con_name = strdup(acs_name); */
+                       (void)connection_profile_create(
                                        CONNECTION_PROFILE_TYPE_CELLULAR,
                                        _(profile_name), &con_info);
                        if (CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET
                                        == ad->srvType) {
-                               /*Internet */
-                               (void) connection_profile_set_cellular_service_type(
+                               /* Internet */
+                               (void)connection_profile_set_cellular_service_type(
                                                con_info,
                                                CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET);
                        } else if (CONNECTION_CELLULAR_SERVICE_TYPE_MMS
                                        == ad->srvType) {
-                               /*MMS */
-                               (void) connection_profile_set_cellular_service_type(
+                               /* MMS */
+                               (void)connection_profile_set_cellular_service_type(
                                                con_info,
                                                CONNECTION_CELLULAR_SERVICE_TYPE_MMS);
-                       } else { /*MMS + Internet(Together) */
-                               (void) connection_profile_set_cellular_service_type(
+                       } else { /* MMS + Internet(Together) */
+                               (void)connection_profile_set_cellular_service_type(
                                                con_info,
                                                CONNECTION_CELLULAR_SERVICE_TYPE_INTERNET);
-                               (void) connection_profile_create(
+                               (void)connection_profile_create(
                                                CONNECTION_PROFILE_TYPE_CELLULAR,
                                                _(profile_name), &con_info_2);
-                               (void) connection_profile_set_cellular_service_type(
+                               (void)connection_profile_set_cellular_service_type(
                                                con_info_2,
                                                CONNECTION_CELLULAR_SERVICE_TYPE_MMS);
                                SETTING_TRACE("con_info_2:%p", con_info_2);
@@ -1679,9 +1487,9 @@ static int __save_connection(void *data)
        /* save access name */
        SETTING_TRACE("acs_name:%s", acs_name);
 
-       (void) connection_profile_set_cellular_apn(con_info, acs_name);
+       (void)connection_profile_set_cellular_apn(con_info, acs_name);
        if (con_info_2)
-               (void) connection_profile_set_cellular_apn(con_info_2,
+               (void)connection_profile_set_cellular_apn(con_info_2,
                                acs_name);
        FREE(acs_name);
 
@@ -1691,40 +1499,10 @@ static int __save_connection(void *data)
        SETTING_TRACE("-----> radio button state: %d",
                        elm_radio_value_get(ad->chk_type));
 
-#ifdef OLD_AUTH_CONCEPT
-       /* save user name */
-       if (!safeStrCmp(usr_name, "")
-                       && CONNECTION_CELLULAR_AUTH_TYPE_NONE != type) {
-               setting_create_popup(ad, ad->md.window,
-                               NULL, _(Insert_User_Name_Desc),
-                               __setting_network_connection_popup_rsp_cb, 2/*SECONDS*/, false, false, 0);
-               FREE(usr_name);
-               FREE(pwd);
-               FREE(addr);
-               FREE(port);
-               return SETTING_DNET_RETURN_NULL_USER_NAME;
-       }
-
-       /* save password */
-       if (!safeStrCmp(pwd, "")
-                       && CONNECTION_CELLULAR_AUTH_TYPE_NONE != type) {
-               /*this code is not used now, so remove the ID which is not
-                *  used in po file*/
-               setting_create_popup(ad, ad->md.window,
-                               NULL, _(""),
-                               __setting_network_connection_popup_rsp_cb,
-                               2/*SECONDS*/, false, false, 0);
-               FREE(usr_name);
-               FREE(pwd);
-               FREE(addr);
-               FREE(port);
-               return SETTING_DNET_RETURN_NULL_PASSWORD;
-       }
-#endif
-       (void) connection_profile_set_cellular_auth_info(con_info, type,
+       (void)connection_profile_set_cellular_auth_info(con_info, type,
                        usr_name, pwd);
        if (con_info_2)
-               (void) connection_profile_set_cellular_auth_info(con_info_2,
+               (void)connection_profile_set_cellular_auth_info(con_info_2,
                                type, usr_name, pwd);
 
        /* save proxy addr */
@@ -1736,8 +1514,7 @@ static int __save_connection(void *data)
                        setting_create_popup(ad, ad->md.window,
                                        NULL,
                                        _("IDS_COM_BODY_ENTER_PROXY_EMPTY"),
-                                       __setting_network_connection_popup_rsp_cb,
-                                       2/*SECONDS*/, false, false, 0);
+                                       NULL, 2/*SECONDS*/, false, false, 0);
                        FREE(usr_name);
                        FREE(pwd);
                        FREE(addr);
@@ -1780,8 +1557,8 @@ static int __save_connection(void *data)
                                        && CONNECTION_CELLULAR_SERVICE_TYPE_MMS
                                                        == ad->srvType)) {
                home = elm_entry_markup_to_utf8(ad->data_hm_url->sub_desc);
-               if (home == (char *) NULL) {
-                       (void) connection_profile_set_cellular_home_url(
+               if (home == (char *)NULL) {
+                       (void)connection_profile_set_cellular_home_url(
                                        con_info, URL_HEAD);
                } else {
                        if (!safeStrCmp(home, "")) {
@@ -1789,15 +1566,15 @@ static int __save_connection(void *data)
                                home = strdup(URL_HEAD);
                                ret = SETTING_DNET_RETURN_NULL_HOMEURL;
                        }
-                       (void) connection_profile_set_cellular_home_url(
+                       (void)connection_profile_set_cellular_home_url(
                                        con_info, home);
                }
        }
        FREE(home);
-       if (con_info_2) { /*creating both internet + MMS */
+       if (con_info_2) { /* creating both internet + MMS */
                home = elm_entry_markup_to_utf8(ad->data_hm_url->sub_desc);
-               if (home == (char *) NULL) {
-                       (void) connection_profile_set_cellular_home_url(
+               if (home == (char *)NULL) {
+                       (void)connection_profile_set_cellular_home_url(
                                        con_info_2, URL_HEAD);
                } else {
                        if (!safeStrCmp(home, "")) {
@@ -1805,7 +1582,7 @@ static int __save_connection(void *data)
                                home = strdup(URL_HEAD);
                                ret = SETTING_DNET_RETURN_NULL_HOMEURL;
                        }
-                       (void) connection_profile_set_cellular_home_url(
+                       (void)connection_profile_set_cellular_home_url(
                                        con_info_2, home);
                }
        }
@@ -1815,16 +1592,16 @@ static int __save_connection(void *data)
        FREE(addr);
        FREE(port);
        FREE(home);
-       /*SETTING_TRACE("ad->con_type:%d", ad->con_type); */
+       /* SETTING_TRACE("ad->con_type:%d", ad->con_type); */
        /* save connection */
        if (add_flag) {
                SETTING_TRACE("con_info is %p, con_info_2:%p", con_info,
                                con_info_2);
 
-               /*Add a new profile */
+               /* Add a new profile */
                connection_cellular_service_type_e type =
                                CONNECTION_CELLULAR_SERVICE_TYPE_UNKNOWN;
-               (void) connection_profile_get_cellular_service_type(con_info,
+               (void)connection_profile_get_cellular_service_type(con_info,
                                &type);
 
                err = connection_add_profile(ad->connection, con_info);
@@ -1840,7 +1617,7 @@ static int __save_connection(void *data)
                        return ret;
                }
                connection_profile_h tmp_profile = NULL;
-               (void) connection_get_default_cellular_service_profile(
+               (void)connection_get_default_cellular_service_profile(
                                ad->connection, type, &tmp_profile);
                /*
                 => if there is already default profile, after_profile will be
@@ -1850,22 +1627,22 @@ static int __save_connection(void *data)
                 */
                if (setting_network_equal_profile(con_info, tmp_profile)) {
                        SETTING_TRACE_ERROR("Going to set profile");
-                       (void) connection_set_default_cellular_service_profile(
+                       (void)connection_set_default_cellular_service_profile(
                                        ad->connection, type, tmp_profile);
                } else {
-                       /*nothing to do */
+                       /* nothing to do */
                }
 
-               (void) connection_destroy(tmp_profile);
+               (void)connection_destroy(tmp_profile);
 
-               (void) connection_profile_destroy(con_info);
+               (void)connection_profile_destroy(con_info);
 
-               if (con_info_2) { /*just for MMS + internet */
+               if (con_info_2) { /* just for MMS + internet */
                        connection_cellular_service_type_e type =
                                        CONNECTION_CELLULAR_SERVICE_TYPE_UNKNOWN;
-                       (void) connection_profile_get_cellular_service_type(
+                       (void)connection_profile_get_cellular_service_type(
                                        con_info_2, &type);
-                       /*Add a new profile */
+                       /* Add a new profile */
                        err = connection_add_profile(ad->connection,
                                        con_info_2);
                        if (err != CONNECTION_ERROR_NONE) {
@@ -1880,7 +1657,7 @@ static int __save_connection(void *data)
                                return ret;
                        }
                        connection_profile_h tmp_profile = NULL;
-                       (void) connection_get_default_cellular_service_profile(
+                       (void)connection_get_default_cellular_service_profile(
                                        ad->connection, type, &tmp_profile);
                        /*
                         => if there is already default profile, after_profile
@@ -1891,15 +1668,15 @@ static int __save_connection(void *data)
                        if (setting_network_equal_profile(con_info_2,
                                        tmp_profile)) {
                                SETTING_TRACE_ERROR("Going to set profile");
-                               (void) connection_set_default_cellular_service_profile(
+                               (void)connection_set_default_cellular_service_profile(
                                                ad->connection, type,
                                                tmp_profile);
                        } else {
-                               /*nothing to do */
+                               /* nothing to do */
                        }
 
-                       (void) connection_destroy(tmp_profile);
-                       (void) connection_profile_destroy(con_info_2);
+                       (void)connection_destroy(tmp_profile);
+                       (void)connection_profile_destroy(con_info_2);
                }
        } else {
 
@@ -1921,54 +1698,20 @@ static int __save_connection(void *data)
 
 /* ***************************************************
  *
- *call back func
+ * call back func
  *
  ***************************************************/
-#if 0
-static void
-setting_network_connection_click_softkey_done_cb(void *data,
-               Evas_Object *obj,
-               void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingNetwork *ad = (SettingNetwork *) data;
-       if (ad->data_profile_name)
-               setting_hide_input_pannel_cb(ad->data_profile_name->eo_check);
-
-       if (ad->data_acs_name)
-               setting_hide_input_pannel_cb(ad->data_acs_name->eo_check);
-
-       if (ad->data_user_name)
-               setting_hide_input_pannel_cb(ad->data_user_name->eo_check);
-
-       if (ad->data_pwd)
-               setting_hide_input_pannel_cb(ad->data_pwd->eo_check);
-
-       if (ad->data_pxy_addr)
-               setting_hide_input_pannel_cb(ad->data_pxy_addr->eo_check);
-
-       if (ad->data_pxy_port)
-               setting_hide_input_pannel_cb(ad->data_pxy_port->eo_check);
-
-       if (ad->data_hm_url)
-               setting_hide_input_pannel_cb(ad->data_hm_url->eo_check);
-}
-#endif
-
 static void __save_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        retm_if(data == NULL, "Data parameter is NULL");
 
-       SettingNetwork *ad = (SettingNetwork *) data;
+       SettingNetwork *ad = (SettingNetwork *)data;
        if (obj) {
                evas_object_del(obj);
                obj = NULL;
        }
-       /*re-fetch connection info.. */
+       /* re-fetch connection info.. */
        SETTING_TRACE("ad->con_name:%s", ad->con_name);
 
        ad->apn_MMS = __get_profile_name(CONNECTION_CELLULAR_SERVICE_TYPE_MMS,
@@ -1978,17 +1721,45 @@ static void __save_response_cb(void *data, Evas_Object *obj, void *event_info)
        elm_naviframe_item_pop(ad->md.naviframe);
 }
 
+static Eina_Bool _naviframe_item_pop_cb(void *data, Elm_Object_Item *it)
+{
+       SETTING_TRACE_BEGIN;
+       /* error check */
+       retvm_if(data == NULL, EINA_TRUE, "Data parameter is NULL");
+
+       SettingNetwork *ad = (SettingNetwork *)data;
+
+       elm_object_tree_focus_allow_set(ad->con_create_gl, EINA_FALSE);
+
+       SETTING_TRACE("ad->con_name: %s", ad->con_name);
+       /* new a profile,need to select the "Service type" */
+       if (!safeStrCmp(STR_SETTING_NEW_CONNECTIONS, ad->con_name)
+                       || ad->profile_topper_view
+                                       == &setting_view_network_con) {
+               /* not normal view change,need do specially */
+               setting_view_destroy(&setting_network_connection_create_view,
+                               ad);
+               setting_view_update(&setting_view_network_con, ad);
+               setting_view_update(&setting_view_network_con_list, ad);
+       } else {
+               setting_view_change(&setting_network_connection_create_view,
+                               &setting_view_network_con_list, ad);
+       }
+
+       return EINA_TRUE;
+}
+
 /**
- * [UI-CALLBACK] 'Save' button handler
+ * [UI-CALLBACK] 'Done' button handler
  */
-static void setting_network_connection_click_softkey_save_cb(void *data,
-               Evas_Object *obj, void *event_info)
+static void _click_softkey_done_cb(void *data, Evas_Object *obj,
+               void *event_info)
 {
        SETTING_TRACE_BEGIN;
        /* error check */
        retm_if(data == NULL, "Data parameter is NULL");
 
-       SettingNetwork *ad = (SettingNetwork *) data;
+       SettingNetwork *ad = (SettingNetwork *)data;
 
        int ret = __save_connection(ad);
        /* need special handle */
@@ -2008,52 +1779,18 @@ static void setting_network_connection_click_softkey_save_cb(void *data,
 
        setting_create_popup(ad, ad->md.window, NULL, KeyStr_Saved,
                        __save_response_cb, 1, FALSE, FALSE, 0);
-
-       if (ctxpopup != NULL) {
-               evas_object_del(ctxpopup);
-               ctxpopup = NULL;
-       }
 }
 
-static Eina_Bool __naviframe_item_pop_cb(void *data, Elm_Object_Item *it)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retvm_if(data == NULL, EINA_TRUE, "Data parameter is NULL");
-
-       SettingNetwork *ad = (SettingNetwork *) data;
-
-       elm_object_tree_focus_allow_set(ad->con_create_gl, EINA_FALSE);
-
-       SETTING_TRACE("ad->con_name:%s", ad->con_name);
-       /*new a profile,need to select the "Service type" */
-       if (!safeStrCmp(STR_SETTING_NEW_CONNECTIONS, ad->con_name)
-                       || ad->profile_topper_view
-                                       == &setting_view_network_con) {
-               /*not normal view change,need do specially */
-               setting_view_cleanup(&setting_view_network_connection_create,
-                               ad);
-               setting_view_update(&setting_view_network_con, ad);
-       } else {
-               setting_view_change(&setting_view_network_connection_create,
-                               &setting_view_network_con_list, ad);
-       }
-
-       if (ctxpopup != NULL) {
-               evas_object_del(ctxpopup);
-               ctxpopup = NULL;
-       }
-
-       return EINA_TRUE;
-}
-
-static void setting_network_connection_click_softkey_back_ctx_cb(void *data,
-               Evas_Object *obj, void *event_info)
+/**
+ * [UI-CALLBACK] 'Cancel' button handler
+ */
+static void _click_softkey_cancel_cb(void *data, Evas_Object *obj,
+               void *event_info)
 {
-       __naviframe_item_pop_cb(data, NULL);
+       _naviframe_item_pop_cb(data, NULL);
 }
 
-static void setting_network_connection_check_entry_empty(SettingNetwork *ad)
+static void _check_entry_empty(SettingNetwork *ad)
 {
        SETTING_TRACE_BEGIN;
        if (!ad->has_form_changed) {
@@ -2065,33 +1802,33 @@ static void setting_network_connection_check_entry_empty(SettingNetwork *ad)
        do {
                if (ad->data_profile_name
                                && isEmptyStr(ad->data_profile_name->sub_desc)) {
-                       /*SETTING_TRACE("entry_str:%s",
+                       /* SETTING_TRACE("entry_str:%s",
                         *  ad->data_profile_name->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
                if (ad->data_acs_name
                                && isEmptyStr(ad->data_acs_name->sub_desc)) {
-                       /*SETTING_TRACE("entry_str:%s",
+                       /* SETTING_TRACE("entry_str:%s",
                         *  ad->data_acs_name->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
                if (ad->data_user_name
                                && isEmptyStr(ad->data_user_name->sub_desc)) {
-                       /*SETTING_TRACE("entry_str:%s",
+                       /* SETTING_TRACE("entry_str:%s",
                         * ad->data_user_name->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
                if (ad->data_pwd && isEmptyStr(ad->data_pwd->sub_desc)) {
-                       /*SETTING_TRACE("entry_str:%s",
+                       /* SETTING_TRACE("entry_str:%s",
                         *  ad->data_pwd->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
                }
                if (ad->data_hm_url && isEmptyStr(ad->data_hm_url->sub_desc)) {
-                       /*SETTING_TRACE("entry_str:%s",
+                       /* SETTING_TRACE("entry_str:%s",
                         * ad->data_hm_url->sub_desc); */
                        isFoundEmptyEntry = TRUE;
                        break;
@@ -2100,15 +1837,15 @@ static void setting_network_connection_check_entry_empty(SettingNetwork *ad)
        Evas_Object *done_btn = elm_object_item_part_content_get(ad->navi_it,
                        NAVI_BTN_STYLE_LEFT);
        if (isFoundEmptyEntry) {
-               /*it had not yet been disabled */
+               /* it had not yet been disabled */
                if (!evas_object_pass_events_get(done_btn)) {
                        setting_disable_evas_object(done_btn);
                        setting_dim_evas_object(done_btn, TRUE);
                } else {
-                       /*do nothing..if invoke setting_dim_evas_object many
+                       /* do nothing..if invoke setting_dim_evas_object many
                         * times, the done button will be dimer until it cannot
                         * be see. */
-                       /*refer to the API of setting_dim_evas_object().
+                       /* refer to the API of setting_dim_evas_object().
                         * The API is supplied by Setting itself, winset
                         * doesn't support until now as I now. */
                }
@@ -2118,8 +1855,7 @@ static void setting_network_connection_check_entry_empty(SettingNetwork *ad)
        }
 }
 
-static void setting_network_connection_display_auth_type(SettingNetwork *ad,
-               int auth_type)
+static void _display_auth_type(SettingNetwork *ad, int auth_type)
 {
        SETTING_TRACE_BEGIN;
        retm_if(ad == NULL, "Data parameter is NULL");
@@ -2132,13 +1868,13 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
                if (ad->is_show_user == 0) { /* do only when hiden */
                        SETTING_TRACE("to create");
 
-                       ad->data_user_name = (Setting_GenGroupItem_Data *) calloc(
+                       ad->data_user_name = (Setting_GenGroupItem_Data *)calloc(
                                        1, sizeof(Setting_GenGroupItem_Data));
                        setting_retm_if(ad->data_user_name == NULL,
                                        "calloc failed");
-                       ad->data_user_name->keyStr = (char *) g_strdup(
+                       ad->data_user_name->keyStr = (char *)g_strdup(
                                        KeyStr_UserID);
-                       ad->data_user_name->sub_desc = (char *) g_strdup(
+                       ad->data_user_name->sub_desc = (char *)g_strdup(
                                        ad->ed_user_name_desc);
                        ad->data_user_name->swallow_type =
                                        SWALLOW_Type_LAYOUT_EDITFIELD;
@@ -2148,7 +1884,7 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
                        ad->data_user_name->return_key_type =
                                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
                        ad->data_user_name->activated_cb =
-                                       setting_network_connection_entry_next_activated_cb;
+                                       _entry_next_activated_cb;
 
                        ad->data_user_name->maxlength_reached_cb =
                                        __network_max_len_reached;
@@ -2157,7 +1893,7 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
                        __BACK_POINTER_SET(ad->data_user_name);
 
                        ad->data_user_name->chk_change_cb =
-                                       setting_network_connection_entry_changed_cb;
+                                       _entry_changed_cb;
                        ad->data_user_name->limit_filter_data = calloc(1,
                                        sizeof(Elm_Entry_Filter_Accept_Set));
                        if (ad->data_user_name->limit_filter_data) {
@@ -2172,26 +1908,26 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
                                        ELM_GENLIST_ITEM_NONE,
                                        NULL, ad);
 
-                       ad->data_pwd = (Setting_GenGroupItem_Data *) calloc(1,
+                       ad->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(
+                       ad->data_pwd->keyStr = (char *)g_strdup(
                                        "IDS_ST_BODY_PASSWORD");
-                       ad->data_pwd->sub_desc = (char *) g_strdup(
+                       ad->data_pwd->sub_desc = (char *)g_strdup(
                                        ad->ed_pwd_desc);
                        ad->data_pwd->swallow_type =
                                        SWALLOW_Type_LAYOUT_EDITFIELD;
                        ad->data_pwd->userdata = ad;
                        ad->data_pwd->chk_change_cb =
-                                       setting_network_connection_entry_changed_cb;
+                                       _entry_changed_cb;
                        ad->data_pwd->isPasswordFlag = TRUE;
                        ad->data_pwd->isSinglelineFlag = TRUE;
 
                        ad->data_pwd->return_key_type =
                                        ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
                        ad->data_pwd->activated_cb =
-                                       setting_network_connection_entry_next_activated_cb;
+                                       _entry_next_activated_cb;
 
                        ad->data_pwd->maxlength_reached_cb =
                                        __network_max_len_reached;
@@ -2215,7 +1951,7 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
                                        NULL, ad);
 
                        ad->item_above_proxy_add = ad->data_pwd->item;
-                       /*item = st_item_insert_after(ad->scl_edit,
+                       /* item = st_item_insert_after(ad->scl_edit,
                         &itc_seperator,
                         NULL, NULL,
                         ad->data_pwd->item,
@@ -2225,7 +1961,7 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
                         (item , ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);*/
 
                        ad->has_form_changed = TRUE;
-                       setting_network_connection_check_entry_empty(ad);
+                       _check_entry_empty(ad);
                        elm_genlist_item_select_mode_set(
                                        ad->data_user_name->item,
                                        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
@@ -2254,45 +1990,30 @@ static void setting_network_connection_display_auth_type(SettingNetwork *ad,
 
                }
                ad->has_form_changed = TRUE;
-               setting_network_connection_check_entry_empty(ad);
+               _check_entry_empty(ad);
                ad->is_show_user = 0;
 
        }
 }
 
-static void setting_network_connection_entry_changed_cb(void *data,
-               Evas_Object *obj, void *event_info)
+static void _entry_changed_cb(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 *)data;
        SettingNetwork *ad = list_item->userdata;
        const char *entry_str = elm_entry_entry_get(obj);
 
-       if (list_item->maxLengthReachFlag
-                       && list_item->enterKeyPressFlag == false) {
-#if 0
-               int ret = notification_status_message_post(
-                               _("IDS_ST_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"));
-               if (ret != NOTIFICATION_ERROR_NONE)
-               SETTING_TRACE_ERROR(
-                               "notification_status_message_post() failed(%d)",
-                               ret);
-               ad->popup = setting_create_popup(ad, ad->md.window, NULL,
-                               "IDS_ST_TPOP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED",
-                               NULL, 2, TRUE, FALSE, 0);
-               elm_object_focus_set(list_item->eo_check, EINA_FALSE);
-#endif
-       }
        list_item->maxLengthReachFlag = FALSE;
        list_item->enterKeyPressFlag = FALSE;
-       /*G_FREE(list_item->sub_desc);//release first */
-       list_item->sub_desc = (char *) g_strdup(entry_str);
+       /* G_FREE(list_item->sub_desc);//release first */
+       list_item->sub_desc = (char *)g_strdup(entry_str);
        ad->has_form_changed = TRUE;
-       setting_network_connection_check_entry_empty(ad);
+       _check_entry_empty(ad);
 }
-static void setting_network_connection_hide_input_pannel(void *data)
+
+static void _hide_input_pannel(void *data)
 {
        SETTING_TRACE_BEGIN;
        retm_if(data == NULL, "Data parameter is NULL");
@@ -2318,4 +2039,3 @@ static void setting_network_connection_hide_input_pannel(void *data)
        if (ad->data_hm_url && ad->data_hm_url->eo_check)
                setting_hide_input_pannel_cb(ad->data_hm_url->eo_check);
 }
-
index ae04ed8042ea401e718ad675e98f7a91e2528b33..6a4d0b34d888e605cf9ffc739306f350d972814f 100644 (file)
@@ -276,7 +276,7 @@ static int setting_network_profile_delete_create(void *cb)
 
        Evas_Object *scroller = elm_genlist_add(ad->md.layout);
        retvm_if(scroller == NULL, SETTING_DRAW_ERR_FAIL_SCROLLER,
-                       "Cannot set scroller object  as contento of layout");
+                       "Cannot set genlist object as content of layout");
        elm_object_style_set(scroller, "dialogue");
        elm_genlist_clear(scroller); /* first to clear list */
        evas_object_smart_callback_add(scroller, "realized", __gl_realized_cb,
index ba1bb2ef0fe4777933509f016a9586e0ee1d65d3..28e2d9e382df511a9794d804725eea267867a2fd 100644 (file)
@@ -217,7 +217,7 @@ static setting_view *__get_network_view_to_load(void *data)
                setting_view_node_table_register(&setting_view_network_con_list,
                                &setting_view_network_con);
                setting_view_node_table_register(
-                               &setting_view_network_connection_create,
+                               &setting_network_connection_create_view,
                                &setting_view_network_con_list);
                setting_view_node_table_register(
                                &setting_view_network_profile_delete,
@@ -505,7 +505,7 @@ static void on_app_terminate(void *priv)
        setting_view_destroy(&setting_view_network_select_network, ad);
        setting_view_destroy(&setting_view_network_con, ad);
        setting_view_destroy(&setting_view_network_con_list, ad);
-       setting_view_destroy(&setting_view_network_connection_create, ad);
+       setting_view_destroy(&setting_network_connection_create_view, ad);
        setting_view_destroy(&setting_view_network_profile_delete, ad);
        setting_view_destroy(&setting_view_network_main, ad);
 
index f1a40c3b596d8623f78ca3e81ee6069c7b87a965..606f769176a4e57b2161810047fd21c9ee9dc4a0 100755 (executable)
@@ -178,7 +178,8 @@ static int battery_main_create(void *data)
 
        // Conformant
        Evas_Object *conform = elm_conformant_add(ad->md.window);
-       evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND,
+                       EVAS_HINT_EXPAND);
        elm_win_resize_object_add(ad->md.window, conform);
        evas_object_show(conform);
 
@@ -188,8 +189,10 @@ static int battery_main_create(void *data)
 
        elm_naviframe_prev_btn_auto_pushed_set(navi, EINA_TRUE);
        elm_object_part_content_set(conform, "elm.swallow.content", navi);
-       eext_object_event_callback_add(navi, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
-       eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_BACK,
+                       eext_naviframe_back_cb, NULL);
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE,
+                       eext_naviframe_more_cb, NULL);
 
        if (navi == NULL) {
                SETTING_TRACE(" *** elm_naviframe_add returns NULL *** ");
@@ -208,13 +211,15 @@ static int battery_main_create(void *data)
 
        /* genlist */
        genlist = elm_genlist_add(navi);
-       retvm_if(genlist == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER, "Cannot set scroller object as contento of layout");
+       retvm_if(genlist == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER,
+                        "Cannot set genlist object as content of layout");
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_genlist_clear(genlist);     /* first to clear list */
 
        ad->md.genlist = genlist;
 
-       evas_object_size_hint_weight_set(ad->md.genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_weight_set(ad->md.genlist, EVAS_HINT_EXPAND,
+                       EVAS_HINT_EXPAND);
        elm_win_resize_object_add(ad->md.naviframe, ad->md.genlist);
        evas_object_show(genlist);
 
@@ -230,7 +235,8 @@ static int battery_main_create(void *data)
                        button, NULL, genlist, NULL);
 //     elm_object_item_domain_text_translatable_set(navi_it, SETTING_PACKAGE,
 //                     EINA_TRUE);
-       elm_naviframe_item_pop_cb_set(navi_it, (Elm_Naviframe_Item_Pop_Cb)_battery_main_click_softkey_back_cb, ad);
+       elm_naviframe_item_pop_cb_set(navi_it,
+                       (Elm_Naviframe_Item_Pop_Cb)_battery_main_click_softkey_back_cb, ad);
        ad->md.naviframe_it = navi_it;
        Setting_GenGroupItem_Data *item = NULL;
 
@@ -258,8 +264,10 @@ static int battery_main_create(void *data)
        _battery_usage_details_list(ad);
 
        /* Check charger status */
-       vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW, __charger_status_vconf_change_cb, ad);
-       vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY, __charger_status_vconf_change_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW,
+                       __charger_status_vconf_change_cb, ad);
+       vconf_notify_key_changed(VCONFKEY_SYSMAN_BATTERY_CAPACITY,
+                       __charger_status_vconf_change_cb, ad);
 
 //     vconf_notify_key_changed