From 822bde1f45b627c9fb0c24f8e5651fad8189cb0a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 8 Dec 2011 15:13:19 +0000 Subject: [PATCH] Elm entry: Use the new evas_textblock_markup_to_plain when pasting. This sloves many issues with pasting format. SVN revision: 66036 --- legacy/elementary/src/lib/elm_entry.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index 0dcedd10bc..913ffa00ad 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -1096,9 +1096,13 @@ _elm_entry_entry_paste(Evas_Object *obj, const char *entry) info.insert = EINA_TRUE; info.change.insert.pos = elm_entry_cursor_pos_get(obj); info.change.insert.content = eina_stringshare_add(entry); - /* FIXME: VERY BAD! Breaks with utf8 and formats! */ - info.change.insert.plain_length = - eina_stringshare_strlen(info.change.insert.content); + { + char *tmp; + tmp = evas_textblock_markup_to_plain(elm_entry_textblock_get(obj), + info.change.insert.content); + info.change.insert.plain_length = eina_unicode_utf8_get_len(tmp); + free(tmp); + } elm_entry_entry_insert(obj, entry); evas_object_smart_callback_call(obj, SIG_CHANGED_USER, &info);