[REFACTOR] Removal of unused objects from the SettingNetwork structure.

Change-Id: Id9db191d2da76c30614cf8e9d255daa84659529d
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-network/include/setting-network.h b/setting-network/include/setting-network.h
index 4dfebb3ec436ec94154728100c39b95f8a81df40..acbd7e6e865c260eaf9063415d91d2c137ec7442 100644 (file)
--- a/setting-network/include/setting-network.h
+++ b/setting-network/include/setting-network.h
@@ -181,11 +181,6 @@ struct _SettingNetwork {
        connection_profile_h sel_profile_h;
        setting_view *profile_topper_view;
 
-       /*xmlDocPtr whitelist_doc; */
-       /*xmlNodePtr whitelist_root_node; */
-       void *whitelist_doc;
-       void *whitelist_root_node;
-
 #if SUPPORT_TETHERING
        tethering_h th_main;
        tethering_h th_connections;
@@ -194,8 +189,6 @@ struct _SettingNetwork {
 #endif
        int profile_service_type;
 
-       Evas_Object *popup_concreate;
-       Evas_Object *popup_conlist;
        Evas_Object *popup_conreset;
        Evas_Object *popup_conreset_complete;
        Evas_Object *popup;
@@ -210,34 +203,21 @@ struct _SettingNetwork {
        Elm_Object_Item *navi_it;
        Elm_Object_Item *navi_it_con_list;
        Elm_Object_Item *navi_it_profile_del_list;
-       Evas_Object *bottom_btn;
 
        /*connection-create */
        Evas_Object *con_create_gl; /* connection create */
 
        /*Evas_Object *conformant; */
-       Evas_Object *back_btn;
        Evas_Object *l_button;
        Evas_Object *r_button;
-       /*Evas_Object *m_button; */
 
        bool has_form_changed;
-//     Evas_Object *genlist_sel_network;
        Evas_Object *connections_gl; /* genlist in connections view */
        Evas_Object *con_list_gl; /* genlist in connections view */
-       int cur_profile_num;
 
-       Evas_Object *controllbar;
        Evas_Object *network_popup;
        char *view_type_string;
 
-       unsigned int subs_id_net[SETTING_NETWORK_SUBS_ID_NET_LEN];
-
-       bool b_trigged_by_searching;
-       bool b_trigged_by_modechanging;
-       bool b_restore_3g_status;
-       bool b_restore_roaming_status;
-
 #ifdef UI_NETWORK_MODE
        Setting_GenGroupItem_Data *data_net_mode;
 #endif
@@ -253,10 +233,6 @@ struct _SettingNetwork {
        Setting_GenGroupItem_Data *mms_conn;
        Setting_GenGroupItem_Data *selected_profile;
 
-       Evas_Object *chk_mode;
-       Evas_Object *pop_gsm;
-       Evas_Object *chk_3gcon;
-
 #ifdef UI_NETWORK_MODE
        int net_mode; /* like vconf key */
 #endif
@@ -297,9 +273,6 @@ struct _SettingNetwork {
        Setting_GenGroupItem_Data *data_roam_pdn_type;
        Setting_GenGroupItem_Data *data_hm_url;
        Setting_GenGroupItem_Data *data_auth_type;
-       Setting_GenGroupItem_Data *data_type_nor;
-       Setting_GenGroupItem_Data *data_type_sec;
-       Setting_GenGroupItem_Data *data_type_none;
 
        Evas_Object *scl_edit;
 
@@ -307,32 +280,16 @@ struct _SettingNetwork {
        Eina_List *profile_list;
        Eina_List *profile_del_list;
 
-       /* Preferred network network list for genlist */
-       Evas_Object *gl_network;
-       Elm_Genlist_Item_Class itc;
-
-       Evas_Object *selInfoPop;
-       Evas_Object *selInfoPop_layout;
        Evas_Object *rdg;
 
-       /* Delete */
-       Setting_GenGroupItem_Data *data_delete_all;
        /**********************************************/
        setting_view *view_to_load;
        Ecore_Timer *timer;
 
        char *internet_apn_name;
        char *MMS_apn_name;
-       Ecore_Idler *add_apn_idler;
        Ecore_Idler *add_apn_timer;
 
-       int is_update;
-
-       int viewtype;
-
-       /*dual sim */
-       int sim_type;
-
        bool init_done;
 
        /***********************************************/

diff --git a/setting-network/src/setting-network-con-list.c b/setting-network/src/setting-network-con-list.c
index 37259046cf6737bbb469ede1474d05ab1ff60a4d..f8a396ffcdd1284d0d383ab53d6f27e7a9e3ef88 100755 (executable)
--- a/setting-network/src/setting-network-con-list.c
+++ b/setting-network/src/setting-network-con-list.c
@@ -285,7 +285,6 @@ static int __con_list_recreate(void *cb)
                elm_object_item_disabled_set(elm_toolbar_last_item_get(toolbar),
                                EINA_TRUE);
        }
-       ad->cur_profile_num = idx;
 
        SETTING_TRACE_END;
        return SETTING_RETURN_SUCCESS;

diff --git a/setting-network/src/setting-network-connection-create.c b/setting-network/src/setting-network-connection-create.c
index 599fedea05a073d6ca0d69bb00897bb884341d52..80499b11aff70bf78cf0f3541a064ecca09f027a 100644 (file)
--- a/setting-network/src/setting-network-connection-create.c
+++ b/setting-network/src/setting-network-connection-create.c
@@ -1287,8 +1287,6 @@ static int _view_destroy(void *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, */
        if (ad->l_button) {
                evas_object_del(ad->l_button);