tizen 2.3 release

[apps/home/settings.git] / setting-network / src / setting-network-preferred-network.c

diff --git a/setting-network/src/setting-network-preferred-network.c b/setting-network/src/setting-network-preferred-network.c
index fe3283d..c2a2cf7 100755 (executable)
--- a/setting-network/src/setting-network-preferred-network.c
+++ b/setting-network/src/setting-network-preferred-network.c
@@ -1,20 +1,25 @@
 /*
  * setting
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *
- * Licensed under the Flora License, Version 1.1 (the License);
+ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
+ *
+ * Contact: MyoungJune Park <mj2004.park@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://floralicense.org/license/
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 #include <setting-network-preferred-network.h>
+#include <efl_assist.h>
 
 static int setting_network_preferred_network_create(void *cb);
 static int setting_network_preferred_network_destroy(void *cb);
@@ -78,20 +83,22 @@ static int setting_network_preferred_network_create(void *cb)
 
        int tapi_ret = TAPI_API_SUCCESS;
 
-       bool keep = TRUE;
+       //bool keep = TRUE;
        tapi_ret = tel_get_network_preferred_plmn(ad->handle, setting_tapi_get_preferred_plmn_cb, ad);
        if (tapi_ret != TAPI_API_SUCCESS) {
                SETTING_TRACE_DEBUG
                    ("%s*** [ERR] tel_get_network_preferred_plmn. err=%d ***%s",
                     SETTING_FONT_RED, tapi_ret, SETTING_FONT_BLACK);
-               keep = FALSE;
+               //keep = FALSE;
        }
 
        ad->scl_pref = elm_genlist_add(ad->win_main_layout);
-       elm_object_style_set(ad->scl_pref , "dialogue");
        retvm_if(ad->scl_pref == NULL, SETTING_RETURN_FAIL,
                 "Cannot set scroller object as contento of layout");
+       elm_genlist_realization_mode_set(ad->scl_pref, EINA_TRUE);
+       elm_object_style_set(ad->scl_pref , "dialogue");
        elm_genlist_clear(ad->scl_pref);        /* first to clear list */
+       evas_object_smart_callback_add(ad->scl_pref, "realized", __gl_realized_cb, NULL);
 
        setting_push_layout_navi_bar(_("IDS_ST_BODY_PREFERRED_NETWORKS"),
                                     _("IDS_COM_BODY_BACK"), _("IDS_COM_ADD"),
@@ -283,12 +290,15 @@ setting_network_preferred_network_click_softkey_add_cb(void *data,
        SettingNetworkUG *ad = (SettingNetworkUG *) data;
 
        ad->popup = elm_ctxpopup_add(ad->navi_bar);
+       ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL);
+
        /* evas_object_smart_callback_add(ad->popup, "hide", _ctxpopup_cb, ad->popup); */
 
        elm_ctxpopup_item_append(ad->popup, _("IDS_ST_BODY_NETWORK_LIST"), NULL,
                                 setting_network_preferred_network_click_ctxpopup_menu_1_cb,
                                 ad);
-       elm_ctxpopup_item_append(ad->popup, _("IDS_ST_POP_TEXT_NEW_NETWORK"),
+       /*currently,this code logic is not used,so remove the ID which is not in po file*/
+       elm_ctxpopup_item_append(ad->popup, _(""),
                                 NULL,
                                 setting_network_preferred_network_click_ctxpopup_menu_2_cb,
                                 ad);