Enable keyboard mode changer in wayland environment

Change-Id: I0af32b3323168d6330e232b6ed1ad1c47ac2dd16

diff --git a/Makefile.am b/Makefile.am
index 11ba5b1..be4a7fe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,10 +56,8 @@ endif
 pkgconfig_DATA          = isf.pc scim.pc \
                          $(GTK_UTILS_PKGCONFIG)
 
-if ISF_BUILD_KBD_MODE_CHANGER
 kbdmodechangerxmldir = @RO_PACKAGES_DIR@
 kbdmodechangerxml_DATA = org.tizen.isf-kbd-mode-changer.xml
-endif
 
 if ISF_INSTALL_SYSTEMD_SCRIPT
 SYSTEMD_SCRIPT = scim.service scim.path

diff --git a/configure.ac b/configure.ac
index d31deb9..a9dd63a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -728,9 +728,6 @@ AM_CONDITIONAL(ISF_BUILD_DB_UTIL,
 AM_CONDITIONAL(ISF_INSTALL_SYSTEMD_SCRIPT,
                 [test "$enable_lazy_launch" = "no"])
 
-AM_CONDITIONAL(ISF_BUILD_KBD_MODE_CHANGER,
-                [test "$ISF_HAS_ECOREX" = "yes"])
-
 AC_SUBST(SCIM_BUILD_TESTS)
 AC_SUBST(SCIM_BUILD_CONFIG_SIMPLE)
 AC_SUBST(SCIM_BUILD_CONFIG_SOCKET)

diff --git a/ism/extras/kbd_mode_changer/Makefile.am b/ism/extras/kbd_mode_changer/Makefile.am
index 97703a8..4a346e2 100644 (file)
--- a/ism/extras/kbd_mode_changer/Makefile.am
+++ b/ism/extras/kbd_mode_changer/Makefile.am
@@ -21,9 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir) \
 
 noinst_HEADERS =
 
-if ISF_BUILD_KBD_MODE_CHANGER
 ISF_KBD_MODE_CHANGER = isf-kbd-mode-changer
-endif
 
 appexecdir            = @RO_APP_DIR@/org.tizen.isf-kbd-mode-changer/bin/
 appexec_PROGRAMS      = $(ISF_KBD_MODE_CHANGER)

diff --git a/ism/extras/kbd_mode_changer/main.cpp b/ism/extras/kbd_mode_changer/main.cpp
index 65b6743..eb26806 100644 (file)
--- a/ism/extras/kbd_mode_changer/main.cpp
+++ b/ism/extras/kbd_mode_changer/main.cpp
@@ -22,7 +22,9 @@
  *
  */
 
+#if HAVE_ECORE_X
 #include <Ecore_X.h>
+#endif
 #include "main.h"
 
 typedef enum
@@ -46,6 +48,7 @@ void app_control (app_control_h app_control, void *user_data)
 {
     LOGD ("%s\n", __func__);
 
+#if HAVE_ECOREX
     Ecore_X_Atom       prop_x_keyboard_input_detected = 0;
     TOOLBAR_MODE_T     kbd_mode = TOOLBAR_HELPER_MODE;
     Ecore_X_Window     _control_win = 0;
@@ -80,6 +83,7 @@ void app_control (app_control_h app_control, void *user_data)
             }
         }
     }
+#endif
 
     ui_app_exit ();
 }

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 1a2fc87..1788589 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -62,7 +62,6 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 This package contains ISF header files for ISE development.
 
-%if %{without wayland}
 %package -n org.tizen.isf-kbd-mode-changer
 Summary: isf-kbd-mode-changer
 Group: Application
@@ -70,7 +69,6 @@ Requires: %{name} = %{version}-%{release}
 
 %description -n org.tizen.isf-kbd-mode-changer
 isf-kbd-mode-changer
-%endif
 
 %prep
 %setup -q
@@ -182,7 +180,6 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im
 %{_libdir}/pkgconfig/isf.pc
 %{_libdir}/pkgconfig/scim.pc
 
-%if %{without wayland}
 %post -n org.tizen.isf-kbd-mode-changer
 mkdir -p %{TZ_SYS_RO_APP}/org.tizen.isf-kbd-mode-changer
 
@@ -190,4 +187,3 @@ mkdir -p %{TZ_SYS_RO_APP}/org.tizen.isf-kbd-mode-changer
 %manifest org.tizen.isf-kbd-mode-changer.manifest
 %{TZ_SYS_RO_PACKAGES}/org.tizen.isf-kbd-mode-changer.xml
 %{APP_PREFIX}/*
-%endif