From 34217e12906e3269f0579666623f1c8c55059c15 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Thu, 18 Aug 2016 15:19:32 +0900 Subject: [PATCH] Remove dependency with efl-assist Change-Id: I29a265d7ca27bccfee89e59242baa82b1e6362bd Signed-off-by: Seonah Moon --- CMakeLists.txt | 1 - packaging/wifi-efl-ug.spec | 3 +-- sources/libraries/Common/common_eap_connect.c | 1 - sources/libraries/Common/common_ip_info.c | 1 - sources/libraries/Common/common_pswd_popup.c | 1 - sources/libraries/Common/include/common_utils.h | 1 - sources/ui-gadget/include/ug_wifi.h | 1 - sources/ui-gadget/viewers-layout/viewer_manager.c | 1 - sources/wearable/CMakeLists.txt | 1 - sources/wearable/inc/wearable-circle/view/layout_wps_progress.h | 2 +- sources/wearable/inc/wearable-circle/view/popup_change_ap.h | 2 +- sources/wearable/inc/wearable-circle/view/popup_scanning.h | 2 +- sources/wearable/inc/wearable-circle/view/popup_unable_scan.h | 2 +- sources/wearable/src/wearable-circle/app_main.c | 1 - sources/wearable/src/wearable-circle/view/base.c | 1 - sources/wearable/src/wearable-circle/view/layout_ap_info.c | 1 - sources/wearable/src/wearable-circle/view/layout_detail.c | 1 - sources/wearable/src/wearable-circle/view/layout_eap_method.c | 1 - sources/wearable/src/wearable-circle/view/layout_main.c | 1 - sources/wearable/src/wearable-circle/view/layout_password_entry.c | 1 - sources/wearable/src/wearable-circle/view/layout_proxy_setting.c | 1 - sources/wearable/src/wearable-circle/view/layout_scan.c | 1 - sources/wearable/src/wearable-circle/view/layout_static_ip.c | 1 - sources/wearable/src/wearable-circle/view/layout_wearable_input.c | 1 - sources/wearable/src/wearable-circle/view/layout_wps_method.c | 1 - sources/wearable/src/wearable-circle/view/layout_wps_progress.c | 5 ++--- sources/wearable/src/wearable-circle/view/popup_change_ap.c | 5 ++--- sources/wearable/src/wearable-circle/view/popup_scanning.c | 5 ++--- sources/wearable/src/wearable-circle/view/popup_unable_scan.c | 5 ++--- sources/wearable/src/wearable-circle/view/toast_popup.c | 1 - sources/wearable/src/wearable-circle/view/util/efl_helper.c | 1 - sources/wifi-syspopup/wifi-syspopup.c | 2 +- 32 files changed, 14 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ace1b06..824f982 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ pkg_check_modules(pkgs REQUIRED ecore-input appcore-efl elementary - efl-assist capi-ui-efl-util glib-2.0 ui-gadget-1 diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index 9d2c362..97448f6 100644 --- 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.200 +Version: 1.0.201 Release: 1 Group: App/Network License: Flora-1.1 @@ -16,7 +16,6 @@ BuildRequires: pkgconfig(ecore-imf) BuildRequires: pkgconfig(ecore-input) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(efl-assist) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(cert-svc-vcore) diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c index 84f5045..d0c9dd9 100755 --- a/sources/libraries/Common/common_eap_connect.c +++ b/sources/libraries/Common/common_eap_connect.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/sources/libraries/Common/common_ip_info.c b/sources/libraries/Common/common_ip_info.c index b22ee43..d75b926 100755 --- a/sources/libraries/Common/common_ip_info.c +++ b/sources/libraries/Common/common_ip_info.c @@ -18,7 +18,6 @@ */ #include -#include #include "common.h" #include "ug_wifi.h" diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c index 71a14d8..840f0d4 100755 --- a/sources/libraries/Common/common_pswd_popup.c +++ b/sources/libraries/Common/common_pswd_popup.c @@ -17,7 +17,6 @@ * */ #include -#include #include #include "common.h" diff --git a/sources/libraries/Common/include/common_utils.h b/sources/libraries/Common/include/common_utils.h index ebc88c9..d58700c 100755 --- a/sources/libraries/Common/include/common_utils.h +++ b/sources/libraries/Common/include/common_utils.h @@ -34,7 +34,6 @@ extern "C" #undef _ #endif #include -#include #include "wlan_manager.h" diff --git a/sources/ui-gadget/include/ug_wifi.h b/sources/ui-gadget/include/ug_wifi.h index 64493f0..a011729 100644 --- a/sources/ui-gadget/include/ug_wifi.h +++ b/sources/ui-gadget/include/ug_wifi.h @@ -28,7 +28,6 @@ extern "C" #endif #include -#include #include "common.h" #include "common_pswd_popup.h" diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c index 3669567..af0e780 100755 --- a/sources/ui-gadget/viewers-layout/viewer_manager.c +++ b/sources/ui-gadget/viewers-layout/viewer_manager.c @@ -18,7 +18,6 @@ */ #include -#include #include #include #include diff --git a/sources/wearable/CMakeLists.txt b/sources/wearable/CMakeLists.txt index 25150e9..d1bc113 100755 --- a/sources/wearable/CMakeLists.txt +++ b/sources/wearable/CMakeLists.txt @@ -67,7 +67,6 @@ pkg_check_modules(pkgs REQUIRED vconf ecore glib-2.0 - efl-assist elementary bundle # ui-extension diff --git a/sources/wearable/inc/wearable-circle/view/layout_wps_progress.h b/sources/wearable/inc/wearable-circle/view/layout_wps_progress.h index fe7a514..5e8edd2 100755 --- a/sources/wearable/inc/wearable-circle/view/layout_wps_progress.h +++ b/sources/wearable/inc/wearable-circle/view/layout_wps_progress.h @@ -45,7 +45,7 @@ void layout_wps_progress_activate_rotary_event(layout_wps_progress_object *self) void layout_wps_progress_set_show_finished_cb(layout_wps_progress_object *self, Evas_Smart_Cb func, void *data); void layout_wps_progress_set_destroy_cb(layout_wps_progress_object *self, - Ea_Event_Cb func, void *data); + Evas_Smart_Cb func, void *data); void layout_wps_progress_set_label_text(layout_wps_progress_object *self, const gchar *label_text); diff --git a/sources/wearable/inc/wearable-circle/view/popup_change_ap.h b/sources/wearable/inc/wearable-circle/view/popup_change_ap.h index cb743c7..acfe2a3 100755 --- a/sources/wearable/inc/wearable-circle/view/popup_change_ap.h +++ b/sources/wearable/inc/wearable-circle/view/popup_change_ap.h @@ -50,7 +50,7 @@ void popup_change_ap_dismiss(popup_change_ap_object *self, popup_change_ap_dismiss_reason popup_change_ap_get_dismiss_reason(popup_change_ap_object *self); void popup_change_ap_set_destroy_cb(popup_change_ap_object *self, - Ea_Event_Cb func, gpointer data); + Evas_Smart_Cb func, gpointer data); void popup_change_ap_set_tap_ok_button_cb(popup_change_ap_object *self, Evas_Smart_Cb func, gpointer data); void popup_change_ap_set_tap_forget_button_cb(popup_change_ap_object *self, diff --git a/sources/wearable/inc/wearable-circle/view/popup_scanning.h b/sources/wearable/inc/wearable-circle/view/popup_scanning.h index fce53ad..faa4424 100755 --- a/sources/wearable/inc/wearable-circle/view/popup_scanning.h +++ b/sources/wearable/inc/wearable-circle/view/popup_scanning.h @@ -39,7 +39,7 @@ void popup_scanning_show(popup_scanning_object *self); void popup_scanning_dismiss(popup_scanning_object *self); void popup_scanning_set_destroy_cb(popup_scanning_object *self, - Ea_Event_Cb func, void *data); + Evas_Smart_Cb func, void *data); #ifdef __cplusplus } diff --git a/sources/wearable/inc/wearable-circle/view/popup_unable_scan.h b/sources/wearable/inc/wearable-circle/view/popup_unable_scan.h index 6ed850c..7b6953c 100755 --- a/sources/wearable/inc/wearable-circle/view/popup_unable_scan.h +++ b/sources/wearable/inc/wearable-circle/view/popup_unable_scan.h @@ -36,7 +36,7 @@ void popup_unable_scan_destroy(popup_unable_scan_object *self); void popup_unable_scan_show(popup_unable_scan_object *self); void popup_unable_scan_set_destroy_cb(popup_unable_scan_object *self, - Ea_Event_Cb func, gpointer data); + Evas_Smart_Cb func, gpointer data); #ifdef __cplusplus } diff --git a/sources/wearable/src/wearable-circle/app_main.c b/sources/wearable/src/wearable-circle/app_main.c index f16f619..3363613 100755 --- a/sources/wearable/src/wearable-circle/app_main.c +++ b/sources/wearable/src/wearable-circle/app_main.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/base.c b/sources/wearable/src/wearable-circle/view/base.c index 806fc8d..3458e2c 100755 --- a/sources/wearable/src/wearable-circle/view/base.c +++ b/sources/wearable/src/wearable-circle/view/base.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_ap_info.c b/sources/wearable/src/wearable-circle/view/layout_ap_info.c index 7300ec0..d82c37a 100755 --- a/sources/wearable/src/wearable-circle/view/layout_ap_info.c +++ b/sources/wearable/src/wearable-circle/view/layout_ap_info.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_detail.c b/sources/wearable/src/wearable-circle/view/layout_detail.c index ecd0357..b14aa73 100755 --- a/sources/wearable/src/wearable-circle/view/layout_detail.c +++ b/sources/wearable/src/wearable-circle/view/layout_detail.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_eap_method.c b/sources/wearable/src/wearable-circle/view/layout_eap_method.c index a09e329..d0ea4b7 100755 --- a/sources/wearable/src/wearable-circle/view/layout_eap_method.c +++ b/sources/wearable/src/wearable-circle/view/layout_eap_method.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_main.c b/sources/wearable/src/wearable-circle/view/layout_main.c index 28c11cf..fd0c0c2 100755 --- a/sources/wearable/src/wearable-circle/view/layout_main.c +++ b/sources/wearable/src/wearable-circle/view/layout_main.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_password_entry.c b/sources/wearable/src/wearable-circle/view/layout_password_entry.c index c3f8140..1ed0b3d 100755 --- a/sources/wearable/src/wearable-circle/view/layout_password_entry.c +++ b/sources/wearable/src/wearable-circle/view/layout_password_entry.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c b/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c index 977279e..70c1418 100755 --- a/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c +++ b/sources/wearable/src/wearable-circle/view/layout_proxy_setting.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_scan.c b/sources/wearable/src/wearable-circle/view/layout_scan.c index 2f7f5b7..03ddf8a 100755 --- a/sources/wearable/src/wearable-circle/view/layout_scan.c +++ b/sources/wearable/src/wearable-circle/view/layout_scan.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_static_ip.c b/sources/wearable/src/wearable-circle/view/layout_static_ip.c index 97226ea..2d707a8 100755 --- a/sources/wearable/src/wearable-circle/view/layout_static_ip.c +++ b/sources/wearable/src/wearable-circle/view/layout_static_ip.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_wearable_input.c b/sources/wearable/src/wearable-circle/view/layout_wearable_input.c index 1cfc2d2..6bca86b 100755 --- a/sources/wearable/src/wearable-circle/view/layout_wearable_input.c +++ b/sources/wearable/src/wearable-circle/view/layout_wearable_input.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_method.c b/sources/wearable/src/wearable-circle/view/layout_wps_method.c index 8a352a2..5769462 100755 --- a/sources/wearable/src/wearable-circle/view/layout_wps_method.c +++ b/sources/wearable/src/wearable-circle/view/layout_wps_method.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c index 73907c8..18a7263 100755 --- a/sources/wearable/src/wearable-circle/view/layout_wps_progress.c +++ b/sources/wearable/src/wearable-circle/view/layout_wps_progress.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -50,7 +49,7 @@ struct _layout_wps_progress_object { void *data; } show_finished_cb; struct { - Ea_Event_Cb func; + Evas_Smart_Cb func; void *data; } destroy_cb; }; @@ -368,7 +367,7 @@ void layout_wps_progress_set_show_finished_cb(layout_wps_progress_object *self, } void layout_wps_progress_set_destroy_cb(layout_wps_progress_object *self, - Ea_Event_Cb func, void *data) + Evas_Smart_Cb func, void *data) { WIFI_RET_IF_FAIL(self != NULL); diff --git a/sources/wearable/src/wearable-circle/view/popup_change_ap.c b/sources/wearable/src/wearable-circle/view/popup_change_ap.c index 9c3a956..ae8f493 100755 --- a/sources/wearable/src/wearable-circle/view/popup_change_ap.c +++ b/sources/wearable/src/wearable-circle/view/popup_change_ap.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "util.h" @@ -39,7 +38,7 @@ struct _popup_change_ap_object { popup_change_ap_dismiss_reason dismiss_reason; struct { - Ea_Event_Cb func; + Evas_Smart_Cb func; void *data; } destroy_cb; struct { @@ -306,7 +305,7 @@ popup_change_ap_dismiss_reason popup_change_ap_get_dismiss_reason(popup_change_a } void popup_change_ap_set_destroy_cb(popup_change_ap_object *self, - Ea_Event_Cb func, gpointer data) + Evas_Smart_Cb func, gpointer data) { WIFI_RET_IF_FAIL(self); diff --git a/sources/wearable/src/wearable-circle/view/popup_scanning.c b/sources/wearable/src/wearable-circle/view/popup_scanning.c index bea8d4f..814c00d 100755 --- a/sources/wearable/src/wearable-circle/view/popup_scanning.c +++ b/sources/wearable/src/wearable-circle/view/popup_scanning.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -35,7 +34,7 @@ struct _popup_scanning_object { Evas_Object *scanning; struct { - Ea_Event_Cb func; + Evas_Smart_Cb func; void *data; } destroy_cb; }; @@ -176,7 +175,7 @@ void popup_scanning_dismiss(popup_scanning_object *self) } void popup_scanning_set_destroy_cb(popup_scanning_object *self, - Ea_Event_Cb func, void *data) + Evas_Smart_Cb func, void *data) { WIFI_RET_IF_FAIL(self != NULL); diff --git a/sources/wearable/src/wearable-circle/view/popup_unable_scan.c b/sources/wearable/src/wearable-circle/view/popup_unable_scan.c index 203097d..19f786e 100755 --- a/sources/wearable/src/wearable-circle/view/popup_unable_scan.c +++ b/sources/wearable/src/wearable-circle/view/popup_unable_scan.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include @@ -36,7 +35,7 @@ struct _popup_unable_scan_object { Evas_Object *ok_button; struct { - Ea_Event_Cb func; + Evas_Smart_Cb func; void *data; } destroy_cb; }; @@ -165,7 +164,7 @@ void popup_unable_scan_show(popup_unable_scan_object *self) } void popup_unable_scan_set_destroy_cb(popup_unable_scan_object *self, - Ea_Event_Cb func, gpointer data) + Evas_Smart_Cb func, gpointer data) { WIFI_RET_IF_FAIL(self); diff --git a/sources/wearable/src/wearable-circle/view/toast_popup.c b/sources/wearable/src/wearable-circle/view/toast_popup.c index c5bb8c0..73a770e 100755 --- a/sources/wearable/src/wearable-circle/view/toast_popup.c +++ b/sources/wearable/src/wearable-circle/view/toast_popup.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wearable/src/wearable-circle/view/util/efl_helper.c b/sources/wearable/src/wearable-circle/view/util/efl_helper.c index 1a2bd17..f19c8bf 100755 --- a/sources/wearable/src/wearable-circle/view/util/efl_helper.c +++ b/sources/wearable/src/wearable-circle/view/util/efl_helper.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c index f6116af..4a1f9fb 100755 --- a/sources/wifi-syspopup/wifi-syspopup.c +++ b/sources/wifi-syspopup/wifi-syspopup.c @@ -328,7 +328,7 @@ static int wifi_devpkr_create(void) assertm_if(NULL == devpkr_app_state->popup, "syspopup is NULL!!"); } - eext_object_event_callback_add(devpkr_app_state->popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(devpkr_app_state->popup, EEXT_CALLBACK_BACK, __keydown_cb, NULL); event_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, __key_press_cb, NULL); -- 2.7.4