Merge with master branch

Change-Id: I5062c0db20ba06483c5212b7737ffd4c24ec223e

diff --git a/packaging/ise-engine-tables.spec b/packaging/ise-engine-tables.spec
index 4c1beb8..f987d87 100644 (file)
--- a/packaging/ise-engine-tables.spec
+++ b/packaging/ise-engine-tables.spec
@@ -1,7 +1,7 @@
 %define nam               ise-engine-tables
 %define ver               0.0.0228
 %define skim              0
-%define rel               1
+%define rel               2
 %define isf_version       1.0.0
 %define build_scim_setup  0
 %define ENABLE_JA         0

diff --git a/src/scim_table_imengine.cpp b/src/scim_table_imengine.cpp
index bab2cab..fa4bd8c 100755 (executable)
--- a/src/scim_table_imengine.cpp
+++ b/src/scim_table_imengine.cpp
@@ -1697,7 +1697,13 @@ TableInstance::refresh_lookup_table (bool show, bool refresh)
              m_converted_strings.size () < m_inputted_keys.size () - 1)) {
             update_lookup_table (m_lookup_table);
         } else {
-            update_lookup_table (m_common_lookup_table);
+            if(m_inputted_keys.size ())
+            {
+                m_lookup_table.clear ();
+                update_lookup_table (m_lookup_table);
+            }
+            else
+                update_lookup_table (m_common_lookup_table);
         }
         show_lookup_table ();
     }