From cd27255cb05e8fabd4d7b1d7489c3296e374db03 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 7 Jul 2020 12:43:39 +0100 Subject: [PATCH] Revert "edje: Avoid string duplication when possible." This reverts commit 704d58d658ed4424a886c127f3bbe83afde1f2a1. gee. it looked innocent enough... it broke tests and everything in e --- 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 33d00488e5..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 ((*ed)->collection && (*ed)->collection->alias) - { - Edje_Real_Part *rp; - char **path; + Edje_Real_Part *rp; + char **path; - path = eina_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0); - if (!path) return NULL; + path = eina_str_split(part, EDJE_PART_PATH_SEPARATOR_STRING, 0); + if (!path) return NULL; - rp = _edje_real_part_recursive_get_helper(ed, path); + rp = _edje_real_part_recursive_get_helper(ed, path); - free(*path); - free(path); - - return rp; - } - - return _edje_real_part_get(*ed, part);; + free(*path); + free(path); + return rp; } Evas_Object *