From: Carsten Haitzler (Rasterman) Date: Fri, 17 Jul 2020 09:35:52 +0000 (+0100) Subject: Revert "edje: Avoid string duplication when possible." X-Git-Tag: submit/tizen/20200719.223823~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a81fb34fa9c15cf5cd8fd4a1a64791990e2f4c1;p=platform%2Fupstream%2Fefl.git Revert "edje: Avoid string duplication when possible." This reverts commit 8941514b467ce3e5d02c9b936d35a9d393989260. found that this breaks e's systray icon layout... :( --- diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index d9961d6..c1bbaf6 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -5838,23 +5838,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 *