Apply HW back key event

Change-Id: Id976b0c3ce38e0bbfccdd187da8277301d46e2ff
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/include/setting.h b/include/setting.h
index 5de5f4c1f186c187ceadf45dd379a1789bfcfc50..240b14fe2fe45e4d07ad7234975a4381c12b1112 100755 (executable)
--- a/include/setting.h
+++ b/include/setting.h
@@ -38,6 +38,8 @@
 #include <notification.h>
 #include <account.h>
 #include <app_manager.h>
+
+#include <efl_extension.h>
 #include <efl_assist.h>
 #include <dd-display.h>
 /*#include <tethering.h> */

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index c6c2945da199c0c0852d700a4881f099477645fa..08cc4b77c4f20bbe963022ef2883aa7b677a1a3c 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -4,7 +4,7 @@
 
 Name:       org.tizen.setting
 Summary:    Setting application
-Version:    0.1.99
+Version:    0.2.0
 Release:    99
 Group:      misc
 License:    Apache-1.0
@@ -85,6 +85,7 @@ BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(contacts-service2)
 BuildRequires:  pkgconfig(deviced)
 BuildRequires:  pkgconfig(badge)
+BuildRequires:  pkgconfig(efl-extension)
 BuildRequires:  pkgconfig(efl-assist)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(capi-media-camera)

diff --git a/setting-about/CMakeLists.txt b/setting-about/CMakeLists.txt
index 310c7ee3d53ea7ceaf90190f0821e7b69dbe88b6..be8b2c812db22dfffa198f1e6b90806ac27fe46e 100755 (executable)
--- a/setting-about/CMakeLists.txt
+++ b/setting-about/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_about REQUIRED
-       elementary appcore-common appcore-efl efl-assist
+       elementary appcore-common appcore-efl efl-extension efl-assist
        ui-gadget-1
        capi-appfw-application capi-appfw-app-manager evas ecore
        tapi capi-system-info capi-system-system-settings capi-network-bluetooth

diff --git a/setting-about/src/setting-about-main.c b/setting-about/src/setting-about-main.c
index 7ef250508d2ce455fb4e5e874573c591f6027f6d..c7b3f7dd43773b9c28c937d74e4d2763c17e746c 100755 (executable)
--- a/setting-about/src/setting-about-main.c
+++ b/setting-about/src/setting-about-main.c
@@ -32,6 +32,7 @@
 
 #include <app_manager.h>
 #include <efl_assist_events.h>
+#include <efl_extension.h>
 #include <ITapiModem.h>
 
 
@@ -336,7 +337,7 @@ static void __setting_about_popup_regulatory_info(void *data)
 
        ad = (SettingAboutUG *) data;
        popup = elm_popup_add(ad->win_main_layout);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
 
        elm_object_part_text_set(popup, "title,text", _(KeyStr_Regulatory_Info));
        layout = elm_layout_add(popup);

diff --git a/setting-accessibility/CMakeLists.txt b/setting-accessibility/CMakeLists.txt
index 9c34c8aca306e24096b66a782fe54401d516fafe..e02ce85b27c75e99382227beb523bb7efd3c40d2 100644 (file)
--- a/setting-accessibility/CMakeLists.txt
+++ b/setting-accessibility/CMakeLists.txt
@@ -6,7 +6,7 @@ FILE(GLOB ACC_SRCS *.c)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_acc REQUIRED elementary ui-gadget-1 capi-appfw-application
         evas dlog edje glib-2.0 appcore-efl eina appsvc capi-appfw-app-manager
-        vconf efl-assist app2sd json-glib-1.0)
+        vconf efl-extension efl-assist app2sd json-glib-1.0)
 
 FOREACH(flag ${pkgs_acc_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-applications/CMakeLists.txt b/setting-applications/CMakeLists.txt
index 15a2be9e6851cb5959c3dde5b46ecaaf23bb46bd..f3662f0c76bc8ee7dc3d567a805077f78b899488 100755 (executable)
--- a/setting-applications/CMakeLists.txt
+++ b/setting-applications/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_display REQUIRED elementary ecore edje evas appcore-common appcore-efl ui-gadget-1 capi-appfw-application dlog capi-system-device
-deviced efl-assist json-glib-1.0 capi-appfw-package-manager)
+deviced efl-extension efl-assist json-glib-1.0 capi-appfw-package-manager)
 
 FOREACH(flag ${pkgs_display_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-appmgr/CMakeLists.txt b/setting-appmgr/CMakeLists.txt
index 128f91ea1b295e267771f85c3e0ba2577a36f30c..060d8d778035907a87d9f8471d2d6fdfe7702719 100755 (executable)
--- a/setting-appmgr/CMakeLists.txt
+++ b/setting-appmgr/CMakeLists.txt
@@ -20,6 +20,7 @@ pkg_check_modules(pkgs_appmgr REQUIRED
                capi-appfw-app-manager
                vconf
                pkgmgr-info
+               efl-extension
                efl-assist
                app2sd
                json-glib-1.0

diff --git a/setting-appmgr/src/setting-appmgr-main.c b/setting-appmgr/src/setting-appmgr-main.c
index 0ca8cd26768f5c434ca423d3dd7b6a3f3e14b017..60cf52e7a24af334c7d00d59119efa9e87a82295 100644 (file)
--- a/setting-appmgr/src/setting-appmgr-main.c
+++ b/setting-appmgr/src/setting-appmgr-main.c
@@ -17,7 +17,7 @@
  *
  */
 #include <appsvc.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 #include "setting-appmgr-utils.h"
 #include "setting-appmgr-runinfo.h"
@@ -69,7 +69,7 @@ static void appmgrUg_main_sort_popup(void *data, Evas_Object *obj,
        elm_object_style_set(popup, "default");
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_part_text_set(popup, "title,text", _(MGRAPP_STR_SORT_BY));
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, appmgrUg_popup_del, ad);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, appmgrUg_popup_del, ad);
        evas_object_smart_callback_add(popup, "block,clicked", appmgrUg_popup_del, ad);
        evas_object_show(popup);
 
@@ -206,8 +206,8 @@ static void appmgrUg_main_create_more_popup(void *data, Evas_Object *obj,
        ctxpopup = elm_ctxpopup_add(ad->navi);
        elm_object_style_set(ctxpopup, "more/default");
        elm_ctxpopup_auto_hide_disabled_set(ctxpopup, EINA_TRUE);
-       ea_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL);
-       ea_object_event_callback_add(ctxpopup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb, NULL);
+       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL);
+       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_MORE, eext_ctxpopup_back_cb, NULL);
 
        evas_object_smart_callback_add(ctxpopup, "dismissed", appmgrUg_popup_del, ad);
        evas_object_smart_callback_add(elm_object_top_widget_get(ctxpopup),
@@ -220,7 +220,7 @@ static void appmgrUg_main_create_more_popup(void *data, Evas_Object *obj,
        elm_object_item_domain_text_translatable_set(it, SETTING_PACKAGE, EINA_TRUE);
 
        Evas_Object *ao = elm_object_part_access_object_get(ctxpopup, "access.outline");
-       ea_screen_reader_access_info_prepend_cb_set(ao, ELM_ACCESS_CONTEXT_INFO,
+       eext_screen_reader_access_info_prepend_cb_set(ao, ELM_ACCESS_CONTEXT_INFO,
                                                    _appmgrUg_access_info_prepend_cb, 2);
 
        if (ad->popup)

diff --git a/setting-appmgr/src/setting-appmgr.c b/setting-appmgr/src/setting-appmgr.c
index 67e12ef99c61bae16777cb61346c069c98000fff..499564926378fee3461f7a2970639a0a97ff4b21 100644 (file)
--- a/setting-appmgr/src/setting-appmgr.c
+++ b/setting-appmgr/src/setting-appmgr.c
@@ -20,7 +20,7 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <setting-cfg.h>
 
 #include "setting-appmgr-pkginfo.h"
@@ -136,8 +136,8 @@ static inline Evas_Object *appmgrUg_create_navi(Evas_Object *parent,
        navi = elm_naviframe_add(parent);
        elm_naviframe_prev_btn_auto_pushed_set(navi, EINA_FALSE);
 
-       ea_object_event_callback_add(navi, EA_CALLBACK_BACK, appmgrUg_navi_back, ad);
-       ea_object_event_callback_add(navi, EA_CALLBACK_MORE, ea_naviframe_more_cb, ad);
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_BACK, appmgrUg_navi_back, ad);
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, ad);
 
        evas_object_show(navi);
        return navi;

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index ae1d7c52ae565ce626113c0860846e1c47125769..67b3b13980fb5ee8bd954f7ef1b2ea9b888b21ca 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -10,7 +10,7 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_common_data REQUIRED appcore-efl elementary vconf openssl evas
 ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 alarm-service cairo
 capi-appfw-application capi-system-info capi-system-system-settings pkgmgr-info
-efl-assist notification feedback capi-media-player capi-media-sound-manager dbus-1 icu-i18n icu-io icu-le icu-lx icu-uc eventsystem)
+efl-extension efl-assist notification feedback capi-media-player capi-media-sound-manager dbus-1 icu-i18n icu-io icu-le icu-lx icu-uc eventsystem)
 
 
 FOREACH(flag ${pkgs_common_data_CFLAGS})

diff --git a/setting-common/include/setting-common-draw-widget.h b/setting-common/include/setting-common-draw-widget.h
index 1b8b5fffdbc77a6f9304e46f0af6f7d5966827e9..ee23180ad102f2fd632c6cca8364d657d2bf65c7 100755 (executable)
--- a/setting-common/include/setting-common-draw-widget.h
+++ b/setting-common/include/setting-common-draw-widget.h
@@ -709,7 +709,7 @@ extern Evas_Object *setting_create_image_with_round_corner(Evas *evas, const cha
 extern Evas_Object *setting_create_gif(Evas_Object *parent, const char **png_list);
 
 extern void setting_add_hardkey_features(Evas_Object *popup, void *data);
-extern void ea_popup_back_cb_2(void *data, Evas_Object *obj, void *event_info);
+extern void eext_popup_back_cb_2(void *data, Evas_Object *obj, void *event_info);
 /**
 * @ create a popup window which contents a progressbar
 * @return a popup window which contents a progressbar

diff --git a/setting-common/src/setting-common-draw-genlist.c b/setting-common/src/setting-common-draw-genlist.c
index 2e9019136be56becf3102fa09625bd9ce78beaa9..a6317b8a9139d108e428d73d35d7602e2614bbc8 100755 (executable)
--- a/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@ -21,6 +21,7 @@
 #include <setting-common-draw-widget.h>
 #include <glib.h>
 #include <system_settings.h>
+#include <efl_extension.h>
 #include <efl_assist.h>
 #include <setting-debug.h>
 
@@ -1184,7 +1185,7 @@ static Evas_Object *_datefield_picker_popup_add(Evas_Object *parent, Evas_Object
        Setting_GenGroupItem_Data *item_data = param->item_data;
 
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
 
        Evas_Object *cancel_btn = elm_button_add(popup);
        elm_object_style_set(cancel_btn, "popup");

diff --git a/setting-common/src/setting-common-draw-naviframe.c b/setting-common/src/setting-common-draw-naviframe.c
index f4d360e90e1af40034dbbad600efa8d75e7b3396..e14649367c4d65c68a71080f93f45bf656066f4d 100755 (executable)
--- a/setting-common/src/setting-common-draw-naviframe.c
+++ b/setting-common/src/setting-common-draw-naviframe.c
@@ -21,7 +21,7 @@
 #include <setting-common-draw-widget.h>
 #include <glib.h>
 #include <Elementary.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 extern Eina_List *elm_widget_scrollable_children_get(Evas_Object *obj);
 
@@ -330,8 +330,8 @@ EXPORT_PUBLIC void setting_create_more_btn_click_cb(void *data, Evas_Object *obj
        Evas_Object *ctxpopup = elm_ctxpopup_add(btn_data->parent);
        elm_object_style_set(ctxpopup, "more/default");
        elm_ctxpopup_auto_hide_disabled_set(ctxpopup, EINA_TRUE); /*to disable the rotating dismiss issue */
-       ea_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL); /*to make ctxpopup get the "Back" key event */
-       ea_object_event_callback_add(ctxpopup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb, NULL);/*to make ctxpopup get the "More" key event */
+       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL); /*to make ctxpopup get the "Back" key event */
+       eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_MORE, eext_ctxpopup_back_cb, NULL);/*to make ctxpopup get the "More" key event */
        Ecore_Event_Handler *event_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, __ctxpopup_key_press_cb, ctxpopup);
        evas_object_data_set(ctxpopup, "event_handler", event_handler);
 
@@ -536,8 +536,8 @@ Evas_Object *setting_create_navi_bar(Evas_Object *layout)
 
        elm_naviframe_prev_btn_auto_pushed_set(navi, EINA_FALSE);
 
-       ea_object_event_callback_add(navi, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
-       ea_object_event_callback_add(navi, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL);
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL);
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL);
 
        /*elm_object_item_signal_callback_event(navi */
 

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
index 654be26cbae1c3b4a8c6877be0fab36163120ed3..bd70efdfc4c56764cbd48d1edb750a3535151cf9 100755 (executable)
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -21,7 +21,7 @@
 
 #include <setting-common-draw-widget.h>
 #include <glib.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <notification.h>
 #include <notification_internal.h>
 
@@ -91,7 +91,7 @@ static void __hardkey_keyup_cb(void *data, Evas *e, Evas_Object *obj, void *even
        #endif
 }
 
-EXPORT_PUBLIC void ea_popup_back_cb_2(void *data, Evas_Object *obj, void *event_info)
+EXPORT_PUBLIC void eext_popup_back_cb_2(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
        popup_handle_hardkey(data, obj);
@@ -318,7 +318,7 @@ EXPORT_PUBLIC void __popup_event_set(Evas_Object *popup, void *data,
                }
 #endif
                evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, __popup_del_cb, NULL);
-               ea_object_event_callback_add(popup, EA_CALLBACK_BACK, __ignore_back_key_cb, NULL);
+               eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __ignore_back_key_cb, NULL);
        }
 }
 
@@ -338,7 +338,7 @@ static Evas_Object *__add_progressbar(void *data, Evas_Object *parent,
        SETTING_TRACE_BEGIN;
 
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, __ignore_back_key_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __ignore_back_key_cb, NULL);
        /*setting_add_hardkey_features(popup, data); */
        int value = 0;
        vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &value);
@@ -575,7 +575,7 @@ Evas_Object *setting_create_popup_with_btn(void *data,
 {
        SETTING_TRACE_BEGIN;
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        setting_add_hardkey_features(popup, data);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
@@ -697,7 +697,7 @@ Evas_Object *setting_create_popup_without_btn(void *data,
                                               bool keygrab_flag)
 {
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        setting_add_hardkey_features(popup, data);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
@@ -920,7 +920,7 @@ Evas_Object *setting_create_popup_with_gif(void *data,
                                                                 "popup_checkview_image", NULL, timeout);
 
        setting_add_hardkey_features(popup, data);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        /*evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL); */
        /*evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); */
        /*evas_object_size_hint_min_set(scroller, ELM_SCALE_SIZE(480), ELM_SCALE_SIZE(700)); */
@@ -1002,7 +1002,7 @@ Evas_Object *setting_create_popup_with_label_and_reverse_btn(void *data,
        /*struct appdata *ad = (struct appdata *) data; */
 
        popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_text_set(popup, _(text));
        ADD_POPUP_MULTI_LANGUAGE_AUTO_UPDATE(popup, NULL, text, NULL, NULL, NULL);
@@ -1026,7 +1026,7 @@ Evas_Object *setting_create_popup_with_label_check(void *data,
                                                    int btn_num, ...)
 {
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        setting_add_hardkey_features(popup, data);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
@@ -1150,7 +1150,7 @@ Evas_Object *setting_create_popup_with_image_check(void *data,
        Evas_Object *popup = setting_create_popup_with_checkview(parent, title, check_str, scroller,
                                                                 "popup_checkview_image", check, timeout);
        setting_add_hardkey_features(popup, data);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
 
        ADD_POPUP_BTN(btn_num, popup, response_cb, data);
        evas_object_show(popup);
@@ -1184,7 +1184,7 @@ Evas_Object *setting_create_popup_with_list(Evas_Object **genlist, void *data, E
 
        elm_object_content_set(popup, scroller);
        setting_add_hardkey_features(popup, data);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, data);
        return popup;
 }
 

diff --git a/setting-common/src/setting-common-draw-searchbar.c b/setting-common/src/setting-common-draw-searchbar.c
index 8e9d73e96313448222daa71d1b7e2ac8a2bb9695..d25882af798acfe46efbf2906c30dd3b809e2240 100755 (executable)
--- a/setting-common/src/setting-common-draw-searchbar.c
+++ b/setting-common/src/setting-common-draw-searchbar.c
@@ -20,6 +20,7 @@
  */
 #include <setting-common-draw-widget.h>
 #include <glib.h>
+#include <efl_extension.h>
 #include <efl_assist.h>
 
 /**

diff --git a/setting-common/src/setting-common-draw-widget.c b/setting-common/src/setting-common-draw-widget.c
index 0e7277986861e9cd516aaafeaeb28a1e9988c535..7170eaa5f2e28389851bba93f765b0e20d234fab 100755 (executable)
--- a/setting-common/src/setting-common-draw-widget.c
+++ b/setting-common/src/setting-common-draw-widget.c
@@ -20,7 +20,7 @@
  */
 #include <setting-common-draw-widget.h>
 #include <glib.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 #if SUPPORT_HELPUI
 #include <libhelpui.h>

diff --git a/setting-display/CMakeLists.txt b/setting-display/CMakeLists.txt
index 776dc686d874b70d459f43dbd8076d0adf8194b3..59949a8758e31af1b5e88bf2c3f3aaffc0928077 100755 (executable)
--- a/setting-display/CMakeLists.txt
+++ b/setting-display/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_display REQUIRED elementary ecore edje evas appcore-common appcore-efl ui-gadget-1 capi-appfw-application dlog capi-system-device
-deviced efl-assist json-glib-1.0)
+deviced efl-extension efl-assist json-glib-1.0)
 
 FOREACH(flag ${pkgs_display_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-locktype/CMakeLists.txt b/setting-locktype/CMakeLists.txt
index 73008f90595061134f63624c17b9c8592bb9a60b..6a438997c3e4992748e74e52d4643e96e222f23c 100755 (executable)
--- a/setting-locktype/CMakeLists.txt
+++ b/setting-locktype/CMakeLists.txt
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_locktype REQUIRED ecore evas elementary dlog
 ui-gadget-1 capi-appfw-application appcore-common security-server ail
-capi-media-recorder deviced efl-assist pkgmgr-info
+capi-media-recorder deviced efl-extension efl-assist pkgmgr-info
 )
 
 FOREACH(flag ${pkgs_locktype_CFLAGS})

diff --git a/setting-locktype/src/setting-locktype-main.c b/setting-locktype/src/setting-locktype-main.c
index 5c7842a27dfa047419105d26887564a0b63d5452..1537b04a74a4091466fd0f44c0ff1fda8faaa42c 100644 (file)
--- a/setting-locktype/src/setting-locktype-main.c
+++ b/setting-locktype/src/setting-locktype-main.c
@@ -27,7 +27,7 @@
 #include <security-server.h>
 #include <pkgmgr-info.h>
 #include <ail.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #if SUPPORT_ENCRYPTION
 #include <ode.h>
 #endif

diff --git a/setting-locktype/src/setting-locktype.c b/setting-locktype/src/setting-locktype.c
index 4c9c65ff339c62e94e56adae04cc402b4ab54941..cf3616f1bb9ce0af9122f7bccde257a088ac3332 100644 (file)
--- a/setting-locktype/src/setting-locktype.c
+++ b/setting-locktype/src/setting-locktype.c
@@ -25,7 +25,7 @@
  */
 
 #include <setting-locktype.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 #include <security-server.h>
 

diff --git a/setting-moreconnections/CMakeLists.txt b/setting-moreconnections/CMakeLists.txt
index 75f14e35dab7fae95d47973c2d03b13538f747ca..411e3e80520040f834ebd87c8ddedd9e01b2b622 100644 (file)
--- a/setting-moreconnections/CMakeLists.txt
+++ b/setting-moreconnections/CMakeLists.txt
@@ -14,6 +14,7 @@ pkg_check_modules(pkgs REQUIRED
                dlog
                capi-system-device
                deviced
+               efl-extension
                efl-assist
                json-glib-1.0)
 

diff --git a/setting-network/CMakeLists.txt b/setting-network/CMakeLists.txt
index 4ff82f8e1e33ce2e0308334fc6372319d1115d80..e0134f4f62f6273a9af83c421943a99dd1c52dab 100755 (executable)
--- a/setting-network/CMakeLists.txt
+++ b/setting-network/CMakeLists.txt
@@ -7,7 +7,7 @@ pkg_check_modules(pkgs_network REQUIRED elementary evas ecore ecore-imf eina edj
 appcore-common appcore-efl
 ui-gadget-1 capi-appfw-application
 capi-network-connection
-tapi dlog efl-assist
+tapi dlog efl-extension efl-assist
 notification json-glib-1.0 eventsystem)
 
 FOREACH(flag ${pkgs_network_CFLAGS})

diff --git a/setting-network/src/setting-network-main.c b/setting-network/src/setting-network-main.c
index 05da88fde4804fcdcb61f43859770a5725a658f9..47b3f70ce6bec546e857bc885fad48971acd02c3 100755 (executable)
--- a/setting-network/src/setting-network-main.c
+++ b/setting-network/src/setting-network-main.c
@@ -20,7 +20,7 @@
  */
 #include <setting-network-main.h>
 #include <app_preference.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <eventsystem.h>
 #include <bundle_internal.h>
 
@@ -1219,7 +1219,7 @@ void __change_search_view_on_resp_cb(void *data, Evas_Object *obj,
 Evas_Object *_create_popup(Evas_Object *parent, char *content, setting_call_back_func response_cb, void *data)
 {
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, response_cb, data);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, response_cb, data);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
 
@@ -1249,7 +1249,7 @@ Evas_Object *_create_popup_with_btn(void *data,
 {
        SETTING_TRACE_BEGIN;
        Evas_Object *popup = elm_popup_add(parent);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, NULL);
        setting_add_hardkey_features(popup, data);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);

diff --git a/setting-network/src/setting-network-preferred-network-delete.c b/setting-network/src/setting-network-preferred-network-delete.c
index 3da096db01758799eb24261f6e6894a24ed0b93e..30e7a1d1fafa61e4f147cc9407660e16a5725216 100755 (executable)
--- a/setting-network/src/setting-network-preferred-network-delete.c
+++ b/setting-network/src/setting-network-preferred-network-delete.c
@@ -19,7 +19,7 @@
  *
  */
 #include <setting-network-preferred-network-delete.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 static int setting_network_preferred_network_delete_create(void *cb);
 static int setting_network_preferred_network_delete_destroy(void *cb);
@@ -519,7 +519,7 @@ static void setting_network_preferred_network_create_delete_pop(void *data)
        }
        Evas_Object *popup;
        popup = elm_popup_add(ad->win_get);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb_2, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, NULL);
        setting_add_hardkey_features(popup, ad);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);

diff --git a/setting-network/src/setting-network-preferred-network.c b/setting-network/src/setting-network-preferred-network.c
index f48a2c169cbeae9e9fa64765afa66e1c041d5de2..3781511cbaaa85e0ee1f682c5139ba9ba2092dc0 100755 (executable)
--- a/setting-network/src/setting-network-preferred-network.c
+++ b/setting-network/src/setting-network-preferred-network.c
@@ -19,7 +19,7 @@
  *
  */
 #include <setting-network-preferred-network.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 static int setting_network_preferred_network_create(void *cb);
 static int setting_network_preferred_network_destroy(void *cb);
@@ -291,7 +291,7 @@ setting_network_preferred_network_click_softkey_add_cb(void *data,
        SettingNetworkUG *ad = (SettingNetworkUG *) data;
 
        ad->popup = elm_ctxpopup_add(ad->navi_bar);
-       ea_object_event_callback_add(ad->popup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL);
+       eext_object_event_callback_add(ad->popup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL);
 
        /* evas_object_smart_callback_add(ad->popup, "hide", _ctxpopup_cb, ad->popup); */
 

diff --git a/setting-network/src/setting-network.c b/setting-network/src/setting-network.c
index b1d3ca9a12c1a424d4905cba4f9598544961b6f8..23c65bb7031e17e81e5ccdf7a1bebb7fa5895083 100755 (executable)
--- a/setting-network/src/setting-network.c
+++ b/setting-network/src/setting-network.c
@@ -22,7 +22,7 @@
 #include <setting-network-preferred-network-delete.h>
 #include <setting-network-preferred-network.h>
 #include <setting-debug.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <setting-cfg.h>
 
 
@@ -910,7 +910,7 @@ void setting_tapi_set_plmn_mode_cb(TapiHandle *handle, int result, void *data, v
        setting_network_update_sel_network(ad);
 
        Evas_Object *popup = elm_popup_add(ad->win_get);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
        char r_str_text[128] = { 0, };
@@ -1542,7 +1542,7 @@ static Evas_Object *__create_registering_popup(void *data)
        SettingNetworkUG                        *ad = list_item->userdata;
 
        Evas_Object *popup = elm_popup_add(ad->win_get);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, __ignore_back_key_cb, list_item);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __ignore_back_key_cb, list_item);
 
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
@@ -1640,7 +1640,7 @@ Evas_Object *__create_searching_popup(void *data)
        SettingNetworkUG *ad = list_item->userdata;
 
        Evas_Object *popup = elm_popup_add(ad->ly_main);
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, __search_network_cancel_cb, list_item);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __search_network_cancel_cb, list_item);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
 

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index cd7dabb269ab10cdf73a281add948b61864cb614..ee389683a93b61cb532e8da858c1c1cb7f8d69ba 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -8,7 +8,7 @@ pkg_check_modules(pkgs_profile REQUIRED
                        elementary appcore-common appcore-efl
                        ui-gadget-1 capi-appfw-application capi-appfw-app-manager vconf
                        capi-media-player capi-media-sound-manager
-                       dlog feedback deviced capi-system-device efl-assist
+                       dlog feedback deviced capi-system-device efl-extension efl-assist
                        cairo mm-keysound capi-media-metadata-extractor json-glib-1.0 eventsystem)
 
 FOREACH(flag ${pkgs_profile_CFLAGS})

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index e75ff4182637404f015e6e07d19b863339bcfe20..ef4126a554ec2eb257762059e3da97e8c79b5009 100755 (executable)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -26,7 +26,7 @@
 #include <setting-common-general-func.h>
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <feedback.h>
 
 #define VOLUME_APP_NAME "org.tizen.setting.volume"

diff --git a/setting-profile/src/setting-profile-common.c b/setting-profile/src/setting-profile-common.c
index 90bfb79eb7c8025e6054670a82e3cdc9ad34ca08..ab3e7663cd7781d5d3b3e9b71c1e755f61b95691 100644 (file)
--- a/setting-profile/src/setting-profile-common.c
+++ b/setting-profile/src/setting-profile-common.c
@@ -27,7 +27,7 @@
 #include <app_manager.h>
 #include <metadata_extractor.h>
 #include <player.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <sound_manager_internal.h>
 
 #define PLAY_FEEDBACK(f_type, f_pattern) {\

diff --git a/setting-ringtone/CMakeLists.txt b/setting-ringtone/CMakeLists.txt
index 15e0fa9eb910084fb47fc15f3768d48b356628fc..a4d5e26c76553dd764ed7cb25440e19343cbb49d 100755 (executable)
--- a/setting-ringtone/CMakeLists.txt
+++ b/setting-ringtone/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_ringtone REQUIRED
 elementary appcore-common appcore-efl ui-gadget-1 capi-appfw-application evas capi-media-metadata-extractor
-ecore edje efl-assist glib-2.0 capi-media-player capi-media-sound-manager)
+ecore edje efl-extension efl-assist glib-2.0 capi-media-player capi-media-sound-manager)
 
 FOREACH(flag ${pkgs_ringtone_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-security/CMakeLists.txt b/setting-security/CMakeLists.txt
index afcaadaf82bd167bf515899150093f3ceba87bd9..831c0bc82746cff1309d364730fa591db4b2c91c 100755 (executable)
--- a/setting-security/CMakeLists.txt
+++ b/setting-security/CMakeLists.txt
@@ -4,7 +4,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_security REQUIRED ecore evas elementary tapi dlog
 ui-gadget-1 capi-appfw-application capi-appfw-app-manager appcore-common security-server ail
-deviced capi-media-recorder capi-network-connection efl-assist json-glib-1.0)
+deviced capi-media-recorder capi-network-connection efl-extension efl-assist json-glib-1.0)
 
 FOREACH(flag ${pkgs_security_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-security/src/setting-security-update.c b/setting-security/src/setting-security-update.c
index 36821efdc77e3362938c720d4787cec3721dafe6..3098e8ed5ce79ad7a6264f7ddc2a5d457f5a6aba 100644 (file)
--- a/setting-security/src/setting-security-update.c
+++ b/setting-security/src/setting-security-update.c
@@ -27,7 +27,7 @@
 #include <setting-security-main.h>
 #include <setting-debug.h>
 #include <app.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 static int setting_view_security_update_create(void *cb);
 static int setting_view_security_update_destroy(void *cb);
@@ -553,7 +553,7 @@ static void __ask_create_manual_update_pop_cb(void *data, Evas_Object *obj,
 
                /*POP_UP */
                ad->pop_progress = elm_popup_add(ad->win_get);
-               ea_object_event_callback_add(ad->pop_progress, EA_CALLBACK_BACK, ea_popup_back_cb_2, NULL);
+               eext_object_event_callback_add(ad->pop_progress, EEXT_CALLBACK_BACK, eext_popup_back_cb_2, NULL);
                setting_add_hardkey_features(ad->pop_progress, ad);
                evas_object_size_hint_weight_set(ad->pop_progress, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);

diff --git a/setting-security/src/setting-security.c b/setting-security/src/setting-security.c
index 40efd84bcd728d0df78c1ce3d0499c2f26ac7c42..0fbc7a9bee6af042d71f28cd731438c3692f1247 100755 (executable)
--- a/setting-security/src/setting-security.c
+++ b/setting-security/src/setting-security.c
@@ -22,7 +22,7 @@
 #include <setting-security.h>
 #include <setting-cfg.h>
 
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <app_manager.h>
 #if SUPPORT_ENCRYPTION
 #include <ode.h>
@@ -318,7 +318,7 @@ int pwd_handler_sec_pw_pin1_blocked(SettingSecurityUG *data, void *arg)
                                                      setting_security_pin1_blocked_resp_cb,
                                                      0, 1,
                                                      "IDS_ST_BUTTON_OK");
-       ea_object_event_callback_del(ad->sim_popup, EA_CALLBACK_BACK, ea_popup_back_cb_2);
+       eext_object_event_callback_del(ad->sim_popup, EEXT_CALLBACK_BACK, eext_popup_back_cb_2);
 
        /* End. */
        return 0;

diff --git a/setting-storage/CMakeLists.txt b/setting-storage/CMakeLists.txt
index 3b4f3de12b536488928e85d6fa17ac301378c138..1f60706be122cd6369bb8d91072220dcd6ebef6b 100755 (executable)
--- a/setting-storage/CMakeLists.txt
+++ b/setting-storage/CMakeLists.txt
@@ -6,7 +6,7 @@ FILE(GLOB STORAGE_SRCS src/*.c)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs_storage REQUIRED elementary capi-appfw-application deviced storage
        pkgmgr capi-content-media-content cairo appcore-efl ui-gadget-1 capi-appfw-package-manager
-       efl-assist json-glib-1.0)
+       efl-extension json-glib-1.0)
 
 FOREACH(flag ${pkgs_storage_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-storage/src/setting-storage.c b/setting-storage/src/setting-storage.c
index c2c81ca4832ff85d507ae995f5f66345ff48840b..885d4946b80def2c380016b44e352d87c47c34ff 100755 (executable)
--- a/setting-storage/src/setting-storage.c
+++ b/setting-storage/src/setting-storage.c
@@ -20,7 +20,7 @@
 #define UG_MODULE_API __attribute__ ((visibility("default")))
 #endif
 
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <media_content.h>
 
 #include "setting-cfg.h"
@@ -137,8 +137,8 @@ static inline Evas_Object *storageUg_create_navi(Evas_Object *parent,
        navi = elm_naviframe_add(parent);
        elm_naviframe_prev_btn_auto_pushed_set(navi, EINA_FALSE);
 
-       ea_object_event_callback_add(navi, EA_CALLBACK_BACK, storageUg_navi_back, ad);
-       /*ea_object_event_callback_add(navi, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL); */
+       eext_object_event_callback_add(navi, EEXT_CALLBACK_BACK, storageUg_navi_back, ad);
+       /*eext_object_event_callback_add(navi, EEXT_CALLBACK_MORE, eext_naviframe_more_cb, NULL); */
 
        evas_object_show(navi);
        return navi;

diff --git a/setting-syspopup/CMakeLists.txt b/setting-syspopup/CMakeLists.txt
index be1944fb60c7abd15423e828dc31a8a9a23c4454..460a13d1124400875eaea066e89e0c1e63469147 100755 (executable)
--- a/setting-syspopup/CMakeLists.txt
+++ b/setting-syspopup/CMakeLists.txt
@@ -28,6 +28,7 @@ pkg_check_modules(pkgs_syspopup REQUIRED
        ui-gadget-1
        notification
        alarm-service
+       efl-extension
        efl-assist
        tapi
        pkgmgr

diff --git a/setting-syspopup/src/mode-syspopup.c b/setting-syspopup/src/mode-syspopup.c
index 275f846efd689675f7b5a09ef525bb25c3353d7a..c022f3525726fdad7c9d4b71a093dd548535c3cd 100644 (file)
--- a/setting-syspopup/src/mode-syspopup.c
+++ b/setting-syspopup/src/mode-syspopup.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 
 #include <appcore-efl.h>
 #include <aul.h>
@@ -1320,7 +1320,7 @@ static Evas_Object *__add_progressbar(void *data, Evas_Object *parent,
        Evas_Object *layout;
 
        ad = (struct appdata *) data;
-       popup = ea_center_popup_add(parent);
+       popup = eext_center_popup_add(parent);
 
        layout = elm_layout_add(popup);
        elm_layout_file_set(layout, POPUP_EDJ, "popup_processingview_1button"); /*u can use add button or not */
@@ -1402,7 +1402,7 @@ static Evas_Object *__add_double_line_progressbar(void *data, Evas_Object *paren
        Evas_Object *label;
        Evas_Object *layout;
        Evas_Object *progressbar = NULL;
-       popup = ea_center_popup_add(parent);
+       popup = eext_center_popup_add(parent);
        /* [UI] add lable */
        if (progressbar_lable) {
                label = elm_label_add(popup);
@@ -1529,9 +1529,9 @@ void release_evas_object(Evas_Object **obj)
 }
 
 
-static void ea_popup_back_cb_overide(void *data, Evas_Object *obj, void *event_info)
+static void eext_popup_back_cb_overide(void *data, Evas_Object *obj, void *event_info)
 {
-       ea_popup_back_cb(data, obj, event_info);
+       eext_popup_back_cb(data, obj, event_info);
 
        if (NULL == data) return;
        struct appdata *ad = data;
@@ -1540,7 +1540,7 @@ static void ea_popup_back_cb_overide(void *data, Evas_Object *obj, void *event_i
 
 static void timeout_response_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       ea_popup_back_cb(data, obj, event_info);
+       eext_popup_back_cb(data, obj, event_info);
 
        if (NULL == data) return;
        struct appdata *ad = data;
@@ -2355,7 +2355,7 @@ static Evas_Object *mode_syspopup_create_popup_with_label_check(void *data,
        if (!ad) return NULL;
        Evas_Object *popup = elm_popup_add(parent);
 #if 0
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        if (title) {
                elm_object_part_text_set(popup, "title,text", _(title));
@@ -2381,7 +2381,7 @@ static Evas_Object *mode_syspopup_create_popup_with_label_check(void *data,
        evas_object_show(popup);
        return popup;
 #endif
-       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
        /*setting_add_hardkey_features(popup, data); */
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f9bdc054feda2fc26f45ba230bc8a44b94d635a8..e94c18c9c37a841606786556c7c06deb97e6e6ea 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,6 +24,7 @@ pkg_check_modules(pkgs_main REQUIRED
                                          notification
                                          capi-appfw-app-manager
                                          pkgmgr-info
+                                         efl-extension
                                          efl-assist
                                          sqlite3
                                          accounts-svc

diff --git a/src/personal_mode_util/setting_personal_mode.c b/src/personal_mode_util/setting_personal_mode.c
index 66e7ba91c07d341c24b770e871e660a11fde028b..1b7334127d5077abfa08d259f3cfd77941c35aea 100644 (file)
--- a/src/personal_mode_util/setting_personal_mode.c
+++ b/src/personal_mode_util/setting_personal_mode.c
@@ -9,7 +9,7 @@
 #include <setting-common-general-func.h>
 #include <stdio.h>
 #include <Elementary.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <vconf.h>
 #include <app.h>
 #include <ode.h>

diff --git a/src/setting-support-shortcut/support_help_ringtone.c b/src/setting-support-shortcut/support_help_ringtone.c
index 8747e17d2375f746f3ba745926a5d61928305032..390ac84f4f7b7bfe9ae3c73f6f13b298fdab9c2d 100644 (file)
--- a/src/setting-support-shortcut/support_help_ringtone.c
+++ b/src/setting-support-shortcut/support_help_ringtone.c
@@ -30,7 +30,7 @@
 #include <feedback.h>
 #include <dd-led.h>
 #include <device.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <setting-common-general-func.h>
 
 #define EXPORT_PUBLIC __attribute__((visibility("default")))

diff --git a/src/setting-support-shortcut/support_shortcut_wallpaper.c b/src/setting-support-shortcut/support_shortcut_wallpaper.c
index 42983f53382efde4565bf0efaec4f680ae2310cc..aea28dc5422a794982dc3a39ecb490bd739bc3ac 100644 (file)
--- a/src/setting-support-shortcut/support_shortcut_wallpaper.c
+++ b/src/setting-support-shortcut/support_shortcut_wallpaper.c
@@ -30,7 +30,7 @@
 #include <feedback.h>
 #include <dd-led.h>
 #include <device.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <setting-common-general-func.h>
 
 #define EXPORT_PUBLIC __attribute__((visibility("default")))