raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d6f210b3a0d78b73b678636916e98b63d94ae769
commit d6f210b3a0d78b73b678636916e98b63d94ae769 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri Jul 17 10:35:52 2020 +0100 Revert "edje: Avoid string duplication when possible." This reverts commit 8941514b467ce3e5d02c9b936d35a9d393989260. found that this breaks e's systray icon layout... :( --- src/lib/edje/edje_util.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index f0102cd68c..4d9a9dc369 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -5602,23 +5602,17 @@ _edje_real_part_text_text_source_description_get(Edje_Real_Part *ep, Edje_Real_P Edje_Real_Part * _edje_real_part_recursive_get(Edje **ed, const char *part) { - if (strchr(part, EDJE_PART_PATH_SEPARATOR)) - { - Edje_Real_Part *rp; - char **path; - - path = eina_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0); - if (!path) return NULL; - - rp = _edje_real_part_recursive_get_helper(ed, path); + Edje_Real_Part *rp; + char **path; - free(*path); - free(path); + path = eina_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0); + if (!path) return NULL; - return rp; - } + rp = _edje_real_part_recursive_get_helper(ed, path); - return _edje_real_part_get(*ed, part); + free(*path); + free(path); + return rp; } Evas_Object * --
