[TSAM-10919] Delete more button callback in configuration naviframe

Change-Id: I5a5292ef207609e6e28b4a0c21353959e8c93e7e
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/include/mh_view_main.h b/include/mh_view_main.h
index 634ce96..b1448e7 100755 (executable)
--- a/include/mh_view_main.h
+++ b/include/mh_view_main.h
@@ -59,6 +59,8 @@ void _select_connected_dev(void *data, Evas_Object *obj, void *event_info);
 void _genlist_update_device_item(mh_appdata_t *ad);
 void _update_conn_clients(mh_appdata_t *ad);
 void _create_connected_client_view(mh_appdata_t *ad);
+void _ctxpopup_more_button_callback_add(mh_appdata_t *ad);
+void _ctxpopup_more_button_callback_del(mh_appdata_t *ad);
 
 #ifdef __cplusplus
 }

diff --git a/packaging/ug-setting-mobileap-efl.spec b/packaging/ug-setting-mobileap-efl.spec
index 973eaf0..9d392fb 100755 (executable)
--- a/packaging/ug-setting-mobileap-efl.spec
+++ b/packaging/ug-setting-mobileap-efl.spec
@@ -3,7 +3,7 @@
 
 Name:          ug-setting-mobileap-efl
 Summary:       Tethering UI Gadget Library
-Version:       1.0.153
+Version:       1.0.154
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/src/mh_view_main.c b/src/mh_view_main.c
index cc5ee80..89ed31e 100755 (executable)
--- a/src/mh_view_main.c
+++ b/src/mh_view_main.c
@@ -28,6 +28,8 @@
 
 static void __ctx_move_more_ctxpopup(Evas_Object *ctx, mh_appdata_t *ad);
 static void __ctx_delete_more_ctxpopup_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void __create_ctxpopup_more_button(void *data, Evas_Object *obj, void *event_info);
+
 static Eina_Bool rotate_flag = EINA_FALSE;
 
 void _genlist_update_device_item(mh_appdata_t *ad);
@@ -1382,6 +1384,18 @@ void _main_callback_del(mh_appdata_t *ad)
        __MOBILE_AP_FUNC_EXIT__;
 }
 
+void _ctxpopup_more_button_callback_add(mh_appdata_t *ad)
+{
+       eext_object_event_callback_add(ad->naviframe, EEXT_CALLBACK_MORE,
+                       __create_ctxpopup_more_button, ad);
+}
+
+void _ctxpopup_more_button_callback_del(mh_appdata_t *ad)
+{
+       eext_object_event_callback_del(ad->naviframe, EEXT_CALLBACK_MORE,
+                       __create_ctxpopup_more_button);
+}
+
 static void __ctx_move_more_ctxpopup(Evas_Object *ctx, mh_appdata_t *ad)
 {
        Evas_Coord w;
@@ -1473,6 +1487,7 @@ static void __gl_configure_wifi_tethering(void *data, Evas_Object *obj, void *ev
        ad->ctxpopup = NULL;
 
        elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+       _ctxpopup_more_button_callback_del(ad);
        mh_draw_wifi_setup_view(ad);
 
        __MOBILE_AP_FUNC_EXIT__;
@@ -1545,9 +1560,7 @@ void _main_draw_contents(mh_appdata_t *ad)
 
        eext_object_event_callback_add(ad->naviframe, EEXT_CALLBACK_BACK,
                        eext_naviframe_back_cb, NULL);
-       eext_object_event_callback_add(ad->naviframe, EEXT_CALLBACK_MORE,
-                       __create_ctxpopup_more_button, ad);
-
+       _ctxpopup_more_button_callback_add(ad);
        evas_object_smart_callback_add(ad->main.back_btn, "clicked", (Evas_Smart_Cb)__back_btn_cb, (void *)ad);
        elm_object_focus_allow_set(ad->main.back_btn, EINA_FALSE);
 

diff --git a/src/mh_view_wifi_setup.c b/src/mh_view_wifi_setup.c
index 6be6a12..16e281a 100755 (executable)
--- a/src/mh_view_wifi_setup.c
+++ b/src/mh_view_wifi_setup.c
@@ -20,6 +20,7 @@
 
 #include "mh_popup.h"
 #include "mh_view_wifi_setup.h"
+#include "mh_view_main.h"
 #include "mh_string.h"
 
 static void __gl_realized(void *data, Evas_Object *obj, void *event_info);
@@ -936,6 +937,7 @@ Eina_Bool _setting_back_btn_cb(void *data, Elm_Object_Item *navi_item)
                ad->rename_popup = NULL;
        }
        ad->setup.navi_it = NULL;
+       _ctxpopup_more_button_callback_add(ad);
 
        DBG("-\n");
        return EINA_TRUE;