From 01129d3e62a880de921477d32260be0e89a7b13d Mon Sep 17 00:00:00 2001 From: Hyunjee Kim Date: Mon, 20 Jan 2014 09:45:44 +0900 Subject: [PATCH] Implement hardware key event #5 Change-Id: If858489b316327db757c8ba2921d5ae4c5f7deff Signed-off-by: Hyunjee Kim --- packaging/wifi-efl-ug.spec | 2 +- sources/libraries/Common/common_eap_connect.c | 7 +++++++ sources/ui-gadget/viewers-layout/view_detail.c | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index d968086..db1cf79 100644 --- a/packaging/wifi-efl-ug.spec +++ b/packaging/wifi-efl-ug.spec @@ -1,6 +1,6 @@ Name: wifi-efl-ug Summary: Wi-Fi UI Gadget -Version: 0.5.2_36 +Version: 0.5.2_37 Release: 1 Group: App/Network License: Flora License diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c index 2aa9583..c5396e4 100644 --- a/sources/libraries/Common/common_eap_connect.c +++ b/sources/libraries/Common/common_eap_connect.c @@ -18,6 +18,7 @@ */ #include +#include #include "common.h" #include "common_eap_connect.h" #include "i18nmanager.h" @@ -979,6 +980,8 @@ static void __common_eap_connect_cleanup(eap_connect_data_t *eap_data) evas_object_del(radio_main); radio_main = NULL; + ea_object_event_callback_del(eap_data->navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb); + if (eap_data->navi_frame) { evas_object_smart_callback_del(eap_data->navi_frame, "title,clicked", __eap_view_title_clicked_cb); @@ -1243,6 +1246,10 @@ eap_connect_data_t *create_eap_view(Evas_Object *win_main, __common_eap_connect_destroy, eap_data); elm_object_item_part_content_set(navi_it, "title_prev_btn", back_btn); + ea_object_event_callback_add(eap_data->navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL); + elm_naviframe_item_pop_cb_set(navi_it, __common_eap_connect_destroy, eap_data); + + /* Register imf event cbs */ __common_eap_view_set_imf_ctxt_evnt_cb(eap_data); diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/sources/ui-gadget/viewers-layout/view_detail.c index 94b95ed..a6db6e4 100644 --- a/sources/ui-gadget/viewers-layout/view_detail.c +++ b/sources/ui-gadget/viewers-layout/view_detail.c @@ -25,6 +25,7 @@ #include "common_utils.h" #include "common_ip_info.h" #include "common_eap_connect.h" +#include typedef struct _view_detail_data { Evas_Object *win; @@ -213,6 +214,9 @@ static Eina_Bool detailview_sk_cb(void *data, Elm_Object_Item *it) { __COMMON_FUNC_ENTER__; + Evas_Object* navi_frame = viewer_manager_get_naviframe(); + ea_object_event_callback_del(navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb); + view_detail_data *_detail_data = (view_detail_data *)data; retvm_if(NULL == _detail_data, EINA_TRUE); @@ -370,6 +374,8 @@ void view_detail(wifi_device_info_t *device_info, Evas_Object *win_main) } } + ea_object_event_callback_add(navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL); + /* Append the ip info details */ common_util_managed_idle_add(__view_detail_load_ip_info_list_cb, _detail_data); -- 2.7.4