Remove eeze dependency

Change-Id: Icf4f139c1135331e7aaff1fb0ab4ba9c29772b8e

diff --git a/configure.ac b/configure.ac
index 3cc64f0..49be940 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,6 @@ PKG_CHECK_MODULES(WAYLAND, [wayland-server, text-server, input-method-server])
 PKG_CHECK_MODULES(ENLIGHTENMENT, [enlightenment])
 PKG_CHECK_MODULES(ECORE, [ecore])
 PKG_CHECK_MODULES(EINA, [eina])
-PKG_CHECK_MODULES(EEZE, [eeze])
 PKG_CHECK_MODULES(VCONF, [vconf])
 PKG_CHECK_MODULES(DLOG, [dlog])
 PKG_CHECK_MODULES(CAPI_SYSTEM_INFO, [capi-system-info])
@@ -40,9 +39,6 @@ PKG_CHECK_MODULES(XKBCOMMON, [xkbcommon])
 AC_SUBST(ENLIGHTENMENT_CFLAGS)
 AC_SUBST(ENLIGHTENMENT_LIBS)
 
-AC_SUBST(EEZE_CFLAGS)
-AC_SUBST(EEZE_LIBS)
-
 AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
 AC_SUBST(dlopen_libs)
 

diff --git a/packaging/e-mod-tizen-wl-textinput.spec b/packaging/e-mod-tizen-wl-textinput.spec
index 606961a..c173902 100644 (file)
--- a/packaging/e-mod-tizen-wl-textinput.spec
+++ b/packaging/e-mod-tizen-wl-textinput.spec
@@ -12,7 +12,6 @@ BuildRequires: pkgconfig(input-method-server)
 BuildRequires: pkgconfig(enlightenment)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(eina)
-BuildRequires: pkgconfig(eeze)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(capi-system-info)

diff --git a/src/Makefile.am b/src/Makefile.am
index a1dd9ec..a9d2149 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,6 @@ module_la_SOURCES      = e_mod_main.c \
                          e_mod_input_method_manager.c \
                          wti_log.c
 module_la_LIBADD       =
-module_la_CFLAGS       = @WAYLAND_CFLAGS@ @ENLIGHTENMENT_CFLAGS@ @EEZE_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ @VCONF_CFLAGS@ @CAPI_SYSTEM_INFO_CFLAGS@ @XKBCOMMON_CFLAGS@ -DHAVE_WAYLAND_ONLY -DHAVE_WAYLAND
-module_la_LDFLAGS      = -module -avoid-version @WAYLAND_LIBS@ @ENLIGHTENMENT_LIBS@ @EEZE_LIBS@ @ECORE_LIBS@ @EINA_LIBS@ @VCONF_LIBS@ @CAPI_SYSTEM_INFO_LIBS@ @XKBCOMMON_LIBS@
+module_la_CFLAGS       = @WAYLAND_CFLAGS@ @ENLIGHTENMENT_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ @VCONF_CFLAGS@ @CAPI_SYSTEM_INFO_CFLAGS@ @XKBCOMMON_CFLAGS@ -DHAVE_WAYLAND_ONLY -DHAVE_WAYLAND
+module_la_LDFLAGS      = -module -avoid-version @WAYLAND_LIBS@ @ENLIGHTENMENT_LIBS@ @ECORE_LIBS@ @EINA_LIBS@ @VCONF_LIBS@ @CAPI_SYSTEM_INFO_LIBS@ @XKBCOMMON_LIBS@
 module_la_DEPENDENCIES = $(top_builddir)/config.h

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 01c2f97..630bcdf 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -9,7 +9,6 @@
 #include <input-method-server-protocol.h>
 #include <vconf.h>
 #include <vconf-keys.h>
-#include <Eeze.h>
 #include <dlog.h>
 #include <stdlib.h>
 #include <system_info.h>
@@ -149,8 +148,8 @@ static E_Text_Input *g_text_input = NULL;
 static struct wl_client *g_client = NULL;
 static Eina_List *shutdown_list = NULL;
 static Eina_Bool g_disable_show_panel = EINA_FALSE;
-static Eeze_Udev_Watch *eeze_udev_watch_handler = NULL;
 static Ecore_Event_Handler *ecore_key_down_handler = NULL;
+static Ecore_Event_Handler *ecore_device_del_handler = NULL;
 static E_Input_Event_Filter *e_input_key_down_filter = NULL;
 static Eina_List *handlers = NULL;
 static uint32_t g_text_input_count = 1;
@@ -2250,11 +2249,21 @@ set_soft_keyboard_mode()
      vconf_set_bool(VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, 0);
 }
 
-static void
-_e_mod_eeze_udev_watch_cb(const char *text, Eeze_Udev_Event event, void *data, Eeze_Udev_Watch *watch)
+static Eina_Bool
+_e_mod_device_removed_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 {
-   if (event == EEZE_UDEV_EVENT_REMOVE)
+   Ecore_Event_Device_Info *ev = event;
+
+   if (!ev)
+     {
+        LOGE("event parameter is null");
+        return ECORE_CALLBACK_PASS_ON;
+     }
+
+   if (ev->clas == ECORE_DEVICE_CLASS_KEYBOARD)
      set_soft_keyboard_mode();
+
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
@@ -2394,11 +2403,9 @@ e_modapi_init(E_Module *m)
    if (vconf_notify_key_changed(VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, _keyboard_mode_changed_cb, NULL) != 0)
      LOGW ("Failed to register callback function for H/W keyboard input detection.");
 
-   eeze_udev_watch_handler = eeze_udev_watch_add(EEZE_UDEV_TYPE_KEYBOARD,
-                                                 EEZE_UDEV_EVENT_REMOVE,
-                                                 _e_mod_eeze_udev_watch_cb,
-                                                 NULL);
-   if (!eeze_udev_watch_handler)
+   ecore_device_del_handler = ecore_event_handler_add(ECORE_EVENT_DEVICE_DEL, _e_mod_device_removed_cb, NULL);
+
+   if (!ecore_device_del_handler)
      goto err;
 
    E_CLIENT_HOOK_APPEND(hooks_ec, E_CLIENT_HOOK_DEL, _pol_cb_hook_client_del, NULL);
@@ -2419,11 +2426,12 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
 
    vconf_ignore_key_changed(VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, _keyboard_mode_changed_cb);
 
-   if (eeze_udev_watch_handler)
+   if (ecore_device_del_handler)
      {
-        eeze_udev_watch_del(eeze_udev_watch_handler);
-        eeze_udev_watch_handler = NULL;
+        ecore_event_handler_del(ecore_device_del_handler);
+        ecore_device_del_handler = NULL;
      }
+
    _e_mod_text_input_shutdown();
 
    e_input_panel_shutdown();