[TSAM-6507][TSAM-6599] Fix some bugs

- Change user data for checkbox callback
- Release missed popup object

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

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 5a7721c..4d96b9e 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.194
+Version:       1.0.195
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c
index 52e7f1c..71a14d8 100755 (executable)
--- a/sources/libraries/Common/common_pswd_popup.c
+++ b/sources/libraries/Common/common_pswd_popup.c
@@ -507,10 +507,12 @@ static void _chk_changed_cb(void *data, Evas_Object *obj, void *ei)
        }
 
        Eina_Bool state = elm_check_state_get(obj);
+       pswd_popup_t *pswd_popup_data = (pswd_popup_t *)data;
+
        if (state) {
-               elm_entry_password_set((Evas_Object *)data, EINA_FALSE);
+               elm_entry_password_set(pswd_popup_data->entry, EINA_FALSE);
        } else {
-               elm_entry_password_set((Evas_Object *)data, EINA_TRUE);
+               elm_entry_password_set(pswd_popup_data->entry, EINA_TRUE);
        }
        elm_entry_cursor_end_set((Evas_Object *)data);
 }
@@ -539,7 +541,7 @@ static Evas_Object *_gl_pswd_check_box_item_content_get(void *data,
                evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL);
                evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_smart_callback_add(check, "changed",
-                               _chk_changed_cb, pswd_popup_data->entry);
+                               _chk_changed_cb, pswd_popup_data);
 
                elm_object_focus_allow_set(check, EINA_FALSE);
 

diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/sources/wifi-syspopup/viewer-popups/view-main.c
index e467907..59e6906 100755 (executable)
--- a/sources/wifi-syspopup/viewer-popups/view-main.c
+++ b/sources/wifi-syspopup/viewer-popups/view-main.c
@@ -997,6 +997,7 @@ static void view_main_create_empty_layout(void)
        Evas_Object *layout = NULL;
        Evas_Object *prev_box = NULL;
 
+       if (devpkr_app_state->popup == NULL) return;
        prev_box = elm_object_content_get(devpkr_app_state->popup);
        if (prev_box != NULL) {
                evas_object_del(prev_box);

diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c
index 9b8a4e3..f6116af 100755 (executable)
--- a/sources/wifi-syspopup/wifi-syspopup.c
+++ b/sources/wifi-syspopup/wifi-syspopup.c
@@ -653,6 +653,21 @@ static void app_terminate(void *data)
                devpkr_app_state->win_main = NULL;
        }
 
+       if (devpkr_app_state->popup) {
+               evas_object_del(devpkr_app_state->popup);
+               devpkr_app_state->popup = NULL;
+       }
+
+       if (devpkr_app_state->alertpopup) {
+               evas_object_del(devpkr_app_state->alertpopup);
+               devpkr_app_state->alertpopup = NULL;
+       }
+
+       if (devpkr_app_state->eap_popup) {
+               eap_connect_data_free(devpkr_app_state->eap_popup);
+               devpkr_app_state->eap_popup = NULL;
+       }
+
        common_util_managed_ecore_scan_update_timer_del();
        wlan_manager_destroy();