Tables engine should work on any layout, remove layout checking code

Change-Id: I0f7edc2889bc819b8fdaec0dc67e121a1571d63f

diff --git a/configure.ac b/configure.ac
index 7c99e56e53fa8f3396c65738c3d555da94f50ad9..935f311f1cc303d1dbacb78963ebab0a5f38e1f1 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -35,8 +35,6 @@ AC_TYPE_SIZE_T
 
 # Check SCIM 
 PKG_CHECK_MODULES(SCIM,[isf >= $ISF_VERSION])
-# Check Ecore
-PKG_CHECK_MODULES(ECORE_IMF,[ecore-imf >= 0.0])
 
 # Check if we should build setup module
 PKG_CHECK_MODULES(SCIM_GTKUTILS,[scim-gtkutils >= $SCIM_VERSION],

diff --git a/packaging/ise-engine-tables.spec b/packaging/ise-engine-tables.spec
index 546e652ddff02f8a161d4a4ac6e70b248aa6eed6..61e4ca6f0ab858d8da3b2929b9bb33c002767e65 100755 (executable)
--- a/packaging/ise-engine-tables.spec
+++ b/packaging/ise-engine-tables.spec
@@ -21,7 +21,6 @@ BuildRequires:  prelink
 BuildRequires:  gettext-tools
 Requires:      isf >= %{isf_version}
 BuildRequires: isf-devel >= %{isf_version}
-BuildRequires:  pkgconfig(ecore-imf)
 
 %if %{build_scim_setup}
 Requires:      gtk2 >= 2.0.0

diff --git a/src/Makefile.am b/src/Makefile.am
index dea7c63bfa335317fd8b22a76e0bff8443d2a2a2..20b69fb11b11817df4ae8a954fe0104c34a47938 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,8 +43,8 @@ module_LTLIBRARIES    = table.la
 
 table_la_SOURCES       = scim_table_imengine.cpp
 
-table_la_CFLAGS                = @SCIM_CFLAGS@ @ECORE_IMF_CFLAGS@
-table_la_CXXFLAGS      = @SCIM_CFLAGS@ @ECORE_IMF_CFLAGS@
+table_la_CFLAGS                = @SCIM_CFLAGS@
+table_la_CXXFLAGS      = @SCIM_CFLAGS@
 
 table_la_LDFLAGS       = -avoid-version \
                          -rpath $(moduledir) \

diff --git a/src/scim_table_imengine.cpp b/src/scim_table_imengine.cpp
index cffc2417df05d883a2ba43726e8d4c6c58c85f61..64d75eff4e5e6758fefcaddb9ed137b027377feb 100755 (executable)
--- a/src/scim_table_imengine.cpp
+++ b/src/scim_table_imengine.cpp
@@ -53,8 +53,6 @@
 #include <scim.h>
 #include <set>
 
-#include <Ecore_IMF.h>
-
 #include "scim_table_imengine.h"
 #include "scim_table_private.h"
 
@@ -844,20 +842,9 @@ TableInstance::trigger_property (const String &property)
 void
 TableInstance::set_layout (unsigned int layout)
 {
-    switch (layout)
-    {
-        case ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL:
-        case ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBER:
-        case ECORE_IMF_INPUT_PANEL_LAYOUT_EMAIL:
-        case ECORE_IMF_INPUT_PANEL_LAYOUT_URL:
-            refresh_lookup_table(true,false);
-            show_lookup_table ();
-            m_forward = false;
-            break;
-        default:
-            hide_lookup_table ();
-            m_forward = true;
-    }
+    refresh_lookup_table(true,false);
+    show_lookup_table ();
+    m_forward = false;
 }
 
 void