Remove elementary dependency from multiwindow base

Change-Id: I3213aadf7808b7de53b6587a7651a67a23510c0f
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5809c42..2a2289b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ SET(SRCS_mw src/multiwindow_base/appcore_multiwindow_base.c
 SET(HEADERS_mw appcore_multiwindow_base.h)
 
 INCLUDE(FindPkgConfig)
-SET(APPCORE_MULTIWINDOW_PKG_CHECK_MODULES "elementary dlog ecore gobject-2.0 glib-2.0 aul")
+SET(APPCORE_MULTIWINDOW_PKG_CHECK_MODULES "dlog ecore gobject-2.0 glib-2.0 aul ecore-wayland")
 
 pkg_check_modules(pkg_mw REQUIRED ${APPCORE_MULTIWINDOW_PKG_CHECK_MODULES})
 

diff --git a/appcore-multiwindow.pc.in b/appcore-multiwindow.pc.in
index c5502cc..f04a3c4 100644 (file)
--- a/appcore-multiwindow.pc.in
+++ b/appcore-multiwindow.pc.in
@@ -8,7 +8,7 @@ includedir=@INCLUDEDIR@
 Name: app-core-multiwindow
 Description: Tizen application core library for multiwindow
 Version: @VERSION@
-Requires.private: elementary dlog
+Requires.private: ecore-wayland dlog
 Requires: appcore-common
 Libs: -L${libdir} -lappcore-multiwindow
 Cflags: -I${includedir} -I${includedir}/appcore

diff --git a/include/appcore_multiwindow_base.h b/include/appcore_multiwindow_base.h
index fcb90c9..9cec71f 100644 (file)
--- a/include/appcore_multiwindow_base.h
+++ b/include/appcore_multiwindow_base.h
@@ -20,7 +20,7 @@
 #include <bundle.h>
 #include <aul.h>
 #include <appcore_base.h>
-#include <Ecore_Evas.h>
+#include <Ecore_Wayland.h>
 
 typedef struct _appcore_ui_base_window_ops {
        void (*show)(int type, void *event, void *data);
@@ -66,7 +66,7 @@ void appcore_multiwindow_base_window_on_hide(int type, void *event);
 void appcore_multiwindow_base_window_on_lower(int type, void *event);
 void appcore_multiwindow_base_window_on_visibility(int type, void *event);
 void appcore_multiwindow_base_window_on_pre_visibility(int type, void *event);
-void appcore_multiwindow_base_window_bind(appcore_multiwindow_base_instance_h h, Evas_Object *win);
+void appcore_multiwindow_base_window_bind(appcore_multiwindow_base_instance_h h, Ecore_Wl_Window *wl_win);
 
 appcore_multiwindow_base_class appcore_multiwindow_base_class_get_default(void);
 void appcore_multiwindow_base_class_add(appcore_multiwindow_base_class cls);

diff --git a/src/multiwindow_base/appcore_multiwindow_base.c b/src/multiwindow_base/appcore_multiwindow_base.c
index ca72c67..ece1f65 100644 (file)
--- a/src/multiwindow_base/appcore_multiwindow_base.c
+++ b/src/multiwindow_base/appcore_multiwindow_base.c
@@ -23,7 +23,6 @@
 #include <linux/limits.h>
 
 #include <Ecore_Wayland.h>
-#include <Elementary.h>
 #include <glib-object.h>
 #include <malloc.h>
 #include <glib.h>
@@ -192,34 +191,6 @@ static void __window_on_pre_visibility(int type, void *event, void *data)
        appcore_multiwindow_base_window_on_pre_visibility(type, event);
 }
 
-static void __run(void *data)
-{
-       elm_run();
-}
-
-static void __exit(void *data)
-{
-       elm_exit();
-}
-
-static int __init(int argc, char **argv, void *data)
-{
-       elm_init(argc, argv);
-
-       return 0;
-}
-
-static void __finish(void)
-{
-       elm_shutdown();
-
-       /* Check loader case */
-       if (getenv("AUL_LOADER_INIT")) {
-               unsetenv("AUL_LOADER_INIT");
-               elm_shutdown();
-       }
-}
-
 EXPORT_API appcore_multiwindow_base_ops appcore_multiwindow_base_get_default_ops(void)
 {
        appcore_multiwindow_base_ops ops;
@@ -230,10 +201,10 @@ EXPORT_API appcore_multiwindow_base_ops appcore_multiwindow_base_get_default_ops
        ops.base.create = __on_create;
        ops.base.terminate = __on_terminate;
        ops.base.receive = __on_receive;
-       ops.base.init = __init;
-       ops.base.finish = __finish;
-       ops.base.run = __run;
-       ops.base.exit = __exit;
+       ops.base.init = NULL;
+       ops.base.finish = NULL;
+       ops.base.run = NULL;
+       ops.base.exit = NULL;
 
        ops.window.show = __window_on_show;
        ops.window.hide = __window_on_hide;

diff --git a/src/multiwindow_base/appcore_multiwindow_base_window.c b/src/multiwindow_base/appcore_multiwindow_base_window.c
index 29dbf6d..39b4efa 100644 (file)
--- a/src/multiwindow_base/appcore_multiwindow_base_window.c
+++ b/src/multiwindow_base/appcore_multiwindow_base_window.c
@@ -23,7 +23,6 @@
 #include <stdbool.h>
 
 #include <Ecore_Wayland.h>
-#include <Elementary.h>
 #include <glib-object.h>
 #include <glib.h>
 #include <gio/gio.h>
@@ -132,21 +131,19 @@ EXPORT_API void appcore_multiwindow_base_window_on_pre_visibility(int type, void
                appcore_multiwindow_base_instance_resume(cxt->inst);
 }
 
-EXPORT_API void appcore_multiwindow_base_window_bind(appcore_multiwindow_base_instance_h h, Evas_Object *win)
+EXPORT_API void appcore_multiwindow_base_window_bind(appcore_multiwindow_base_instance_h h, Ecore_Wl_Window *wl_win)
 {
        win_context *cxt;
-       Ecore_Wl_Window *wl_win;
        int id;
 
-       cxt = __find_win_context(h);
-       if (cxt) {
-               _ERR("This instance is already binded");
+       if (!wl_win) {
+               _ERR("Invalid parameter");
                return;
        }
 
-       wl_win = elm_win_wl_window_get(win);
-       if (!wl_win) {
-               _ERR("failed to get wayland window");
+       cxt = __find_win_context(h);
+       if (cxt) {
+               _ERR("This instance is already binded");
                return;
        }