cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dc4bad17ddc515c0d0e325af548bd9439bb8c7b7
commit dc4bad17ddc515c0d0e325af548bd9439bb8c7b7 Author: Cedric BAIL <[email protected]> Date: Wed Mar 5 15:12:17 2014 +0900 edje: let's allow to reset escaped text to NULL. @fix T821. --- src/lib/edje/edje_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 7f02804..2ef93db 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -1559,6 +1559,9 @@ _part_text_escaped_set(Eo *obj, void *_pd, va_list *list) if (!rp) return; if ((rp->type != EDJE_RP_TYPE_TEXT) || (!rp->typedata.text)) return; + if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK && + rp->part->type != EDJE_PART_TYPE_TEXT) + return; if ((rp->part->type == EDJE_PART_TYPE_TEXT) && (text)) { Eina_Strbuf *sbuf; @@ -1615,7 +1618,6 @@ _part_text_escaped_set(Eo *obj, void *_pd, va_list *list) if (ret) *ret = int_ret; return; } - if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return; int_ret = _edje_object_part_text_raw_set(ed, obj, rp, part, text); _edje_user_define_string(ed, part, rp->typedata.text->text); if (ret) *ret = int_ret; --
