aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJihoon Kim <imfine98@gmail.com>2013-02-14 02:09:21 +0000
committerJihoon Kim <imfine98@gmail.com>2013-02-14 02:09:21 +0000
commit504055db36ab871f970c588f60a892c22a1cfb74 (patch)
treefac03be222b0cd918af7b1aabe603a747e063e68
parent3974cb3dc171b4319d74d4aa31789ba55cb62d6c (diff)
downloadefl-504055db36ab871f970c588f60a892c22a1cfb74.tar.gz
efl-504055db36ab871f970c588f60a892c22a1cfb74.tar.xz
efl-504055db36ab871f970c588f60a892c22a1cfb74.zip
edje entry : fix bug not to display preedit string with PREEDIT_TYPE_NONE style
SVN revision: 83876
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/edje/edje_entry.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 958858ceb..6ce012de8 100644
--- 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 a34b12992..ed2c794ef 100644
--- 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 f6a5560da..ac2b3eaea 100644
--- 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