From 54b233690d22bc04312e32af8b8dbdd44dad56b3 Mon Sep 17 00:00:00 2001 From: Sung-Taek Hong Date: Tue, 10 Mar 2015 16:31:32 +0900 Subject: [PATCH] edje: correct order of functions Summary: _edje_object_part_text_raw_set() has to locate before _edje_user_define_string(). - _edje_user_define_string takes one of its parameters rp->typedata.text->text, and this is set by _edje_object_part_text_raw_set(). Signed-off-by: Sung-Taek Hong Reviewers: cedric, seoz Subscribers: seoz, cedric Differential Revision: https://phab.enlightenment.org/D2118 --- 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 5187027d74..7646d6494e 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -1247,6 +1247,7 @@ EOLIAN Eina_Bool _edje_object_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text) { Edje_Real_Part *rp; + Eina_Bool int_ret; if ((!ed) || (!part)) return EINA_FALSE; rp = _edje_real_part_recursive_get(&ed, part); @@ -1258,8 +1259,9 @@ _edje_object_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text { return EINA_TRUE; } + int_ret = _edje_object_part_text_raw_set(ed, obj, rp, part, text); _edje_user_define_string(ed, part, rp->typedata.text->text); - return _edje_object_part_text_raw_set(ed, obj, rp, part, text); + return int_ret; } EOLIAN const char*