summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-07-07 12:43:39 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-07-07 12:43:39 +0100
commitcd27255cb05e8fabd4d7b1d7489c3296e374db03 (patch)
tree9e1389c82bdba9145003e4f4a9b333fcbb5ea69c
parent704d58d658ed4424a886c127f3bbe83afde1f2a1 (diff)
downloadefl-cd27255cb05e8fabd4d7b1d7489c3296e374db03.tar.gz
Revert "edje: Avoid string duplication when possible."
This reverts commit 704d58d658ed4424a886c127f3bbe83afde1f2a1. gee. it looked innocent enough... it broke tests and everything in e
-rw-r--r--src/lib/edje/edje_util.c22
1 files 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;
-
- 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 *