From: tasn Date: Wed, 14 Dec 2011 09:52:02 +0000 (+0000) Subject: Evas textblock: Renamed *markup_to_plain to *text_markup_to_utf8. X-Git-Tag: submit/trunk/20120815.174732~657 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2350006192276d5d38e7759a2339e422f88c9b99;p=profile%2Fivi%2Fevas.git Evas textblock: Renamed *markup_to_plain to *text_markup_to_utf8. This should conform better to evas and what the function does. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@66182 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/ChangeLog b/ChangeLog index c66498d..e6eff51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -536,7 +536,7 @@ * Textblock markup: Support self closing format tags, i.e
. You should use
and not
. The latter still works but it's use is discouraged. - * Textblock: Added evas_textblock_markup_to_plain. + * Textblock: Added evas_textblock_text_markup_to_utf8. This lets you convert textblock markup to plain text. This converts formats and everything correctly. diff --git a/src/lib/Evas.h b/src/lib/Evas.h index 0ce3b48..544fa3d 100644 --- a/src/lib/Evas.h +++ b/src/lib/Evas.h @@ -8124,7 +8124,7 @@ EAPI const char *evas_textblock_escape_string_range_get(const c * @return an allocated plain text version of the markup * @since 1.2.0 */ -EAPI char *evas_textblock_markup_to_plain(const Evas_Object *obj, const char *text) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(1, 2); +EAPI char *evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_ARG_NONNULL(1, 2); /** * Creates a new textblock style. diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index bf9d708..778fb21 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -5086,7 +5086,7 @@ evas_object_textblock_text_markup_get(const Evas_Object *obj) } EAPI char * -evas_textblock_markup_to_plain(const Evas_Object *obj, const char *text) +evas_textblock_text_markup_to_utf8(const Evas_Object *obj, const char *text) { /* FIXME: Can be done better, this is the least redundant way of doing it, * but by far the slowest, when the time comes, this should be