edje entry : fix bug not to display preedit string with PREEDIT_TYPE_NONE style

SVN revision: 83876

diff --git a/ChangeLog b/ChangeLog
index 958858c..6ce012d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-14  Jihoon Kim (jihoon)
+
+        * edje entry : fix bug not to display preedit string with PREEDIT_TYPE_NONE style
+
 2013-02-11  Stefan Schmidt
 
         * Fix memory leak in error cases in ethumb.

diff --git a/NEWS b/NEWS
index a34b129..ed2c794 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -163,3 +163,4 @@ Fixes:
     * Fix memory usage spike when rotating with the software_x11 engine.
     * Evas textblock: Fixed a selection issue with different scripts and bidi.
     * Fix memory leak in error case in ethumb.
+    * fix bug not to display preedit string with PREEDIT_TYPE_NONE style

diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index f6a5560..ac2b3ea 100644 (file)
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -3806,6 +3806,8 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA
                             eina_strbuf_free(preedit_attr_str);
                          }
                     }
+                  else
+                    eina_strbuf_append(buf, preedit_string);
                }
           }
         else