Remove efl-assist dependency

Change-Id: Ia82bfde3b70296870e031a0df44895e141f34349
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a328b40..dbb2996 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,6 @@ pkg_check_modules(pkgs REQUIRED
        edje
        elementary
        evas
-       efl-assist
        efl-extension
        gobject-2.0
        syspopup

diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec
index f563c4c..645966a 100644 (file)
--- a/packaging/org.tizen.bt-syspopup.spec
+++ b/packaging/org.tizen.bt-syspopup.spec
@@ -14,7 +14,6 @@ BuildRequires:  pkgconfig(evas)
 %if "%{?profile}" == "wearable"
 BuildRequires:  pkgconfig(syspopup-caller)
 %else
-BuildRequires:  pkgconfig(efl-assist)
 BuildRequires:  pkgconfig(notification)
 %endif
 BuildRequires: pkgconfig(efl-extension)

diff --git a/src/bt-syspopup-m.c b/src/bt-syspopup-m.c
index ced6508..e923be8 100644 (file)
--- a/src/bt-syspopup-m.c
+++ b/src/bt-syspopup-m.c
@@ -39,7 +39,6 @@
 #include <bundle.h>
 #include <app_control.h>
 #include <app_control_internal.h>
-#include <efl_assist.h>
 #include <efl_extension.h>
 
 static void __bluetooth_delete_input_view(struct bt_popup_appdata *ad);
@@ -1471,9 +1470,7 @@ static Evas_Object *__bluetooth_passwd_entry_icon_get(
                };
 
                entry = elm_entry_add(layout);
-#if 0
-               ea_entry_selection_back_event_allow_set(entry, EINA_TRUE);
-#endif
+
                evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0);
                evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0.0);
                elm_entry_single_line_set(entry, EINA_TRUE);
@@ -1855,7 +1852,7 @@ static void __bluetooth_draw_information_popup(struct bt_popup_appdata *ad,
 
        ad->popup = elm_popup_add(ad->layout);
        elm_popup_align_set(ad->popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
-       ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK, func, ad);
+       eext_object_event_callback_add(ad->popup, EEXT_CALLBACK_BACK, func, ad);
 
        /*set window level to HIGH*/
 //     __bluetooth_set_win_level(ad->popup);
@@ -1908,7 +1905,7 @@ static void __bluetooth_draw_toast_popup(struct bt_popup_appdata *ad, char *toas
        ad->popup = elm_popup_add(ad->win_main);
        elm_object_style_set(ad->popup, "toast");
        evas_object_size_hint_weight_set(ad->popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+       eext_object_event_callback_add(ad->popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
        elm_object_part_text_set(ad->popup, "elm.text.content", toast_text);
        evas_object_smart_callback_add(ad->popup, "block,clicked", __bluetooth_popup_block_clicked_cb, NULL);
 
@@ -2509,11 +2506,6 @@ static bool __bluetooth_create(void *data)
        win = __bluetooth_create_win(PACKAGE);
        retv_if(win == NULL, false);
 
-#if 0
-       /* Enable Changeable UI feature */
-       ea_theme_changeable_ui_enabled_set(EINA_TRUE);
-#endif
-
        evas_object_smart_callback_add(win, "wm,rotation,changed",
                __bt_main_win_rot_changed_cb, data);
        ad->win_main = win;

diff --git a/src/bt-syspopup-w.c b/src/bt-syspopup-w.c
index d6c9b6e..c7e8bf9 100644 (file)
--- a/src/bt-syspopup-w.c
+++ b/src/bt-syspopup-w.c
@@ -140,17 +140,6 @@ static void __bluetooth_cleanup(struct bt_popup_appdata *ad)
                ad->agent_proxy = NULL;
        }
 
-#if 0
-       if (ad->color_table) {
-               ea_theme_color_table_free(ad->color_table);
-               ad->color_table = NULL;
-       }
-       if (ad->font_table) {
-               ea_theme_font_table_free(ad->font_table);
-               ad->font_table = NULL;
-       }
-#endif
-
        if (ad->win_main) {
                evas_object_del(ad->win_main);
                ad->win_main = NULL;
@@ -1981,19 +1970,6 @@ static void __bluetooth_terminate(void *data)
                ad->conn = NULL;
        }
 
-#if 0
-       if (ad->color_table != NULL) {
-               ea_theme_color_table_free(ad->color_table);
-               ad->color_table = NULL;
-       }
-
-       if (ad->font_table != NULL) {
-               ea_theme_font_table_free(ad->font_table);
-               ad->font_table = NULL;
-       }
-#endif
-
-
        if (ad->popup) {
                eext_object_event_callback_del(ad->popup, EEXT_CALLBACK_BACK, __bluetooth_back_key_cb);
                evas_object_del(ad->popup);