enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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 <sth253.hong@samsung.com>

Reviewers: cedric, seoz

Subscribers: seoz, cedric

Differential Revision: https://phab.enlightenment.org/D2118
This commit is contained in:
Sung-Taek Hong 2015-03-10 16:31:32 +09:00 committed by ChunEon Park
parent 7b6f4820bc
commit 54b233690d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/edje/edje_util.c
View File

@ -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*