diff options
| author | Sung-Taek Hong <sth253.hong@samsung.com> | 2015-03-10 16:31:32 +0900 |
|---|---|---|
| committer | ChunEon Park <chuneon.park@samsung.com> | 2015-03-10 16:33:43 +0900 |
| commit | f83f490e84b524f2f4350b6f1a283640832151f1 (patch) | |
| tree | 1e8b4b6dd06ac97b1b3b3c2f4385f51a8eea6247 | |
| parent | ed2402f168d1193281691648e3d3c261d0d0d0f3 (diff) | |
| download | efl-f83f490e84b524f2f4350b6f1a283640832151f1.tar.gz | |
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
| -rw-r--r-- | src/lib/edje/edje_util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index e27f93bafa..5546c1afbe 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -1240,6 +1240,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); @@ -1251,8 +1252,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* |