Update preedit string with commit string

Change-Id: Ibc7b97b0e90eca7dede7db5c6d1b0c09aa2053a1

diff --git a/src/scim_table_imengine.cpp b/src/scim_table_imengine.cpp
index 64d75eff4e5e6758fefcaddb9ed137b027377feb..b280198b680966d65c8286cb122fd94d9bb7eeba 100755 (executable)
--- a/src/scim_table_imengine.cpp
+++ b/src/scim_table_imengine.cpp
@@ -761,9 +761,8 @@ TableInstance::move_preedit_caret (unsigned int pos)
 void
 TableInstance::reset ()
 {
-    if (m_inputted_keys.size () && m_preedit_string.size()) {
-        commit_string (m_preedit_string);
-    }
+    m_preedit_string.clear();
+
     m_double_quotation_state = false;
     m_single_quotation_state = false;
 
@@ -1644,8 +1643,7 @@ TableInstance::refresh_preedit ()
         if (end < preedit_string.length())
             attrs.push_back (Attribute(end, preedit_string.length()- end, SCIM_ATTR_DECORATE, SCIM_ATTR_DECORATE_UNDERLINE));
     }
-    update_preedit_string (preedit_string, attrs);
-    update_preedit_caret (caret);
+    update_preedit_string (preedit_string, preedit_string.substr(0, start) + m_lookup_table.get_candidate(0), attrs, caret);
 
     show_preedit_string ();
 }