diff options
| author | Vyacheslav Reutskiy <v.reutskiy@samsung.com> | 2014-08-14 00:08:06 +0900 |
|---|---|---|
| committer | ChunEon Park <hermet@hermet.pe.kr> | 2014-08-14 00:08:07 +0900 |
| commit | d08dd13d3d344ba1d1c3ee458618497585b6f25c (patch) | |
| tree | b93b089d6484e07ce448bda245973fa844be8d0a | |
| parent | c8976fb21edb15ad8fc5e34e0406c3a830088d1d (diff) | |
| download | efl-d08dd13d3d344ba1d1c3ee458618497585b6f25c.tar.gz | |
edje_pick: fix a copied aliases
Summary:
@fix
Reviewers: raster, Hermet, seoz, cedric
Subscribers: cedric, seoz, Sachiel
Differential Revision: https://phab.enlightenment.org/D1305
| -rw-r--r-- | src/bin/edje/edje_pick.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c index fa270783f0..e4609ecc46 100644 --- a/src/bin/edje/edje_pick.c +++ b/src/bin/edje/edje_pick.c @@ -568,10 +568,9 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs) static int current_group_id = 0; Edje_Part_Collection_Directory_Entry *ce; Eina_Bool status = EDJE_PICK_NO_ERROR; - Eina_List *l; + Eina_List *l, *alist = NULL; char *name1 = NULL; - /* Build file header */ if (context.current_file->append) { @@ -592,10 +591,10 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs) ce = eina_hash_find(edf->collection, name1); ce_out = malloc(sizeof(*ce_out)); memcpy(ce_out, ce, sizeof(*ce_out)); + if (ce_out->group_alias) + alist = eina_list_append(alist, eina_stringshare_add(name1)); ce_out->id = current_group_id; - EINA_LOG_INFO("Changing ID of group <%d> to <%d>\n", - ce->id, ce_out->id); current_group_id++; eina_hash_direct_add(out_file->collection, ce_out->entry, ce_out); @@ -606,6 +605,24 @@ _edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs) } eina_iterator_free(i); + EINA_LIST_FOREACH(alist, l, name1) + { + Edje_Part_Collection_Directory_Entry *ce_cor; + + ce = eina_hash_find(edf->collection, name1); + i = eina_hash_iterator_data_new(edf->collection); + EINA_ITERATOR_FOREACH(i, ce_cor) + { + if ((ce->id == ce_cor->id) && (!ce_cor->group_alias)) + break; + } + ce = eina_hash_find(out_file->collection, ce_cor->entry); + ce_cor = eina_hash_find(out_file->collection, name1); + ce_cor->id = ce->id; + } + eina_iterator_free(i); + EINA_LIST_FREE(alist, name1) + eina_stringshare_del(name1); } else { |