edje: Return plain text in retrive surrounding text callback of entry

SVN revision: 80825

diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index dec9817..93d471d 100644 (file)
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -700,3 +700,7 @@
 2012-12-12  Cedric Bail
 
        * Use Evas to compute Ellipsis.
+
+2012-12-13  Jihoon Kim
+
+       * Return plain text in retrive surrounding text callback of entry

diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 7b59692..ae80bf6 100644 (file)
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -32,6 +32,7 @@ Fixes:
     * fix to not update map uv for proxy
     * fix build on Solaris 11.
     * fix duplicate after programs in group inheritance.
+    * fix return plain string in retrive surrounding text callback of entry
 
 Edje 1.7.0
 

diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c
index 2a9d249..783ec76 100644 (file)
--- a/legacy/edje/src/lib/edje_entry.c
+++ b/legacy/edje/src/lib/edje_entry.c
@@ -3587,6 +3587,7 @@ _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx __UNU
    Edje_Real_Part *rp = ed->focused_part;
    Entry *en = NULL;
    const char *str;
+   char *plain_text;
 
    if (!rp) return EINA_FALSE;
    if ((rp->type != EDJE_RP_TYPE_TEXT) ||
@@ -3600,7 +3601,11 @@ _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx __UNU
    if (text)
      {
         str = _edje_entry_text_get(rp);
-        *text = str ? strdup(str) : strdup("");
+        if (str)
+          plain_text = evas_textblock_text_markup_to_utf8(NULL, str);
+        else
+          plain_text = strdup("");
+        *text = plain_text;
      }
 
    if (cursor_pos)