Remove efl-assist dependency 29/43929/1 tizen_3.0.m1_tv accepted/tizen/mobile/20150716.010444 accepted/tizen/tv/20150716.010451 accepted/tizen/wearable/20150716.010504 submit/tizen/20150715.113413 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 tizen_3.0.m1_tv_release tizen_3.0.m2.a1_tv_release
authorgs86.lee <gs86.lee@samsung.com>
Wed, 15 Jul 2015 11:26:33 +0000 (20:26 +0900)
committergs86.lee <gs86.lee@samsung.com>
Wed, 15 Jul 2015 11:26:33 +0000 (20:26 +0900)
Change-Id: If6f94cf64c6eb98dc77bce300c3a861f4c428624

CMakeLists.txt
packaging/org.tizen.lockscreen.spec
src/default_lock.c

index 678be4c..3facbf0 100755 (executable)
@@ -39,7 +39,6 @@ pkg_check_modules(pkgs REQUIRED
        feedback
        msg-service
        tapi
-       efl-assist
        efl-extension
        key-manager
        accounts-svc
index 039d0cd..623b864 100755 (executable)
@@ -49,7 +49,6 @@ BuildRequires:  pkgconfig(ui-gadget-1)
 BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(msg-service)
 BuildRequires:  pkgconfig(tapi)
-BuildRequires:  pkgconfig(efl-assist)
 BuildRequires:  pkgconfig(efl-extension)
 BuildRequires:  pkgconfig(key-manager)
 BuildRequires:  pkgconfig(accounts-svc)
index 9d87981..51f9605 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <Elementary.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <app.h>
 #include <minicontrol-viewer.h>
 #include <bundle.h>
@@ -354,7 +354,7 @@ lock_error_e lock_default_lock_init(void)
        goto_if(!conformant, ERROR);
        s_info.conformant = conformant;
 
-       ea_object_event_callback_add(layout, EA_CALLBACK_BACK, _default_lock_hw_back_cb, NULL);
+       eext_object_event_callback_add(layout, EEXT_CALLBACK_BACK, _default_lock_hw_back_cb, NULL);
 
        bg = lock_background_view_bg_get();
        if (!bg) {
@@ -424,6 +424,7 @@ void lock_default_lock_fini(void)
        }
 
        if (s_info.layout) {
+               eext_object_event_callback_del(s_info.layout, EEXT_CALLBACK_BACK, _default_lock_hw_back_cb);
                evas_object_del(s_info.layout);
                s_info.layout = NULL;
        }