summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVyacheslav Reutskiy <v.reutskiy@samsung.com>2016-07-26 15:25:01 +0300
committerVyacheslav Reutskiy <v.reutskiy@samsung.com>2016-07-26 15:30:15 +0300
commit5d9cb399112b3c7ded0c644f27de03a0a00d7d81 (patch)
tree19e55b71f7916c49137ce38c1910310181172693
parent3f4b2a2c90c391fddbf4afc87475847c008e12c3 (diff)
edje_pick: copy block 'data'
Copy global data from files. Main resoan for it - elementary. Elementary needs data "version" for load widget styles. @fix
-rw-r--r--src/bin/edje/edje_pick.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/bin/edje/edje_pick.c b/src/bin/edje/edje_pick.c
index e8163ca..c89950b 100644
--- a/src/bin/edje/edje_pick.c
+++ b/src/bin/edje/edje_pick.c
@@ -530,6 +530,7 @@ _edje_pick_output_prepare(Edje_File *o, Edje_File *edf, char *name)
530 o->minor = edf->minor; 530 o->minor = edf->minor;
531 o->feature_ver = edf->feature_ver; 531 o->feature_ver = edf->feature_ver;
532 o->collection = eina_hash_string_small_new(NULL); 532 o->collection = eina_hash_string_small_new(NULL);
533 o->data = eina_hash_string_small_new(NULL);
533 534
534 /* Open output file */ 535 /* Open output file */
535 o->ef = eet_open(name, EET_FILE_MODE_WRITE); 536 o->ef = eet_open(name, EET_FILE_MODE_WRITE);
@@ -622,6 +623,24 @@ _edje_pick_header_dependencies_check(Edje_File *out_file, Edje_File *edf, Edje_P
622} 623}
623 624
624static int 625static int
626_edje_pick_data_update(Edje_File *out_file , Edje_File *edf)
627{
628 Eina_Bool status = EDJE_PICK_NO_ERROR;
629 Eina_Iterator *i;
630 Eina_Stringshare *key, *value;
631
632 i = eina_hash_iterator_key_new(edf->data);
633 EINA_ITERATOR_FOREACH(i, key)
634 {
635 if (eina_hash_find(out_file->data, key)) continue;
636 value = eina_hash_find(edf->data, key);
637 eina_hash_direct_add(out_file->data, key, value);
638 }
639
640 return status;
641}
642
643static int
625_edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs) 644_edje_pick_header_make(Edje_File *out_file , Edje_File *edf, Eina_List *ifs)
626{ 645{
627 static int current_group_id = 0; 646 static int current_group_id = 0;
@@ -1493,6 +1512,7 @@ main(int argc, char **argv)
1493 _Edje_Pick_Fonts_add(edf); /* Add fonts from file to fonts list */ 1512 _Edje_Pick_Fonts_add(edf); /* Add fonts from file to fonts list */
1494 1513
1495 /* Copy styles, color class */ 1514 /* Copy styles, color class */
1515 _edje_pick_data_update(out_file, edf);
1496 _edje_pick_styles_update(out_file, edf); 1516 _edje_pick_styles_update(out_file, edf);
1497 _edje_pick_color_class_update(out_file, edf); 1517 _edje_pick_color_class_update(out_file, edf);
1498 1518