summaryrefslogtreecommitdiff
path: root/legacy/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-08-13 16:35:45 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-08-13 16:35:45 +0000
commit6ccc46d5001f1814f992a76e6620820b6c2dce6b (patch)
treee687e597671ac8e98c0890e00d0220822b909564 /legacy/edje
parentf5e69dcc731a451cf2e3db66853503329d990bef (diff)
* edje: finally fix all this eet mess.
SVN revision: 51087
Diffstat (limited to 'legacy/edje')
-rw-r--r--legacy/edje/src/bin/edje_cc_sources.c12
-rw-r--r--legacy/edje/src/bin/edje_data_convert.c6
2 files changed, 10 insertions, 8 deletions
diff --git a/legacy/edje/src/bin/edje_cc_sources.c b/legacy/edje/src/bin/edje_cc_sources.c
index 6c3d3ed172..5bbdd20693 100644
--- a/legacy/edje/src/bin/edje_cc_sources.c
+++ b/legacy/edje/src/bin/edje_cc_sources.c
@@ -24,29 +24,29 @@ source_edd(void)
24{ 24{
25 Eet_Data_Descriptor_Class eddc; 25 Eet_Data_Descriptor_Class eddc;
26 26
27 eet_eina_stream_data_descriptor_class_set(&eddc, "srcfile", sizeof (SrcFile)); 27 eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "srcfile", sizeof (SrcFile));
28 _srcfile_edd = eet_data_descriptor_stream_new(&eddc); 28 _srcfile_edd = eet_data_descriptor_stream_new(&eddc);
29 EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "name", name, EET_T_INLINED_STRING); 29 EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "name", name, EET_T_INLINED_STRING);
30 EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "file", file, EET_T_INLINED_STRING); 30 EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "file", file, EET_T_INLINED_STRING);
31 31
32 eet_eina_stream_data_descriptor_class_set(&eddc, "srcfile_list", sizeof (SrcFile_List)); 32 eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "srcfile_list", sizeof (SrcFile_List));
33 _srcfile_list_edd = eet_data_descriptor_stream_new(&eddc); 33 _srcfile_list_edd = eet_data_descriptor_stream_new(&eddc);
34 EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd); 34 EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd);
35 35
36 eet_eina_stream_data_descriptor_class_set(&eddc, "external", sizeof (External)); 36 eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "external", sizeof (External));
37 _external_edd = eet_data_descriptor_stream_new(&eddc); 37 _external_edd = eet_data_descriptor_stream_new(&eddc);
38 EET_DATA_DESCRIPTOR_ADD_BASIC(_external_edd, External, "name", name, EET_T_INLINED_STRING); 38 EET_DATA_DESCRIPTOR_ADD_BASIC(_external_edd, External, "name", name, EET_T_INLINED_STRING);
39 39
40 eet_eina_stream_data_descriptor_class_set(&eddc, "external_list", sizeof (External_List)); 40 eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "external_list", sizeof (External_List));
41 _external_list_edd = eet_data_descriptor_stream_new(&eddc); 41 _external_list_edd = eet_data_descriptor_stream_new(&eddc);
42 EET_DATA_DESCRIPTOR_ADD_LIST(_external_list_edd, External_List, "list", list, _external_edd); 42 EET_DATA_DESCRIPTOR_ADD_LIST(_external_list_edd, External_List, "list", list, _external_edd);
43 43
44 eet_eina_stream_data_descriptor_class_set(&eddc, "font", sizeof (Font)); 44 eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "font", sizeof (Font));
45 _font_edd = eet_data_descriptor_stream_new(&eddc); 45 _font_edd = eet_data_descriptor_stream_new(&eddc);
46 EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "file", file, EET_T_INLINED_STRING); 46 EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "file", file, EET_T_INLINED_STRING);
47 EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "name", name, EET_T_INLINED_STRING); 47 EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "name", name, EET_T_INLINED_STRING);
48 48
49 eet_eina_stream_data_descriptor_class_set(&eddc, "font_list", sizeof (Font_List)); 49 eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "font_list", sizeof (Font_List));
50 _font_list_edd = eet_data_descriptor_stream_new(&eddc); 50 _font_list_edd = eet_data_descriptor_stream_new(&eddc);
51 EET_DATA_DESCRIPTOR_ADD_LIST(_font_list_edd, Font_List, "list", list, _font_edd); 51 EET_DATA_DESCRIPTOR_ADD_LIST(_font_list_edd, Font_List, "list", list, _font_edd);
52} 52}
diff --git a/legacy/edje/src/bin/edje_data_convert.c b/legacy/edje/src/bin/edje_data_convert.c
index 3ab8b2a5c0..5fb129e702 100644
--- a/legacy/edje/src/bin/edje_data_convert.c
+++ b/legacy/edje/src/bin/edje_data_convert.c
@@ -73,7 +73,8 @@ _edje_edd_old_init(void)
73 eet_data_descriptor_file_new(&eddc); 73 eet_data_descriptor_file_new(&eddc);
74 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_external_directory_entry, Edje_External_Directory_Entry, "entry", entry, EET_T_STRING); 74 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_external_directory_entry, Edje_External_Directory_Entry, "entry", entry, EET_T_STRING);
75 75
76 eet_eina_file_data_descriptor_class_set(&eddc, "Edje_External_Directory", 76 eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
77 "Edje_External_Directory",
77 sizeof (Old_Edje_External_Directory)); 78 sizeof (Old_Edje_External_Directory));
78 _edje_edd_old_edje_external_directory = 79 _edje_edd_old_edje_external_directory =
79 eet_data_descriptor_file_new(&eddc); 80 eet_data_descriptor_file_new(&eddc);
@@ -86,7 +87,8 @@ _edje_edd_old_init(void)
86 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "entry", entry, EET_T_STRING); 87 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "entry", entry, EET_T_STRING);
87 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "file", file, EET_T_STRING); 88 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "file", file, EET_T_STRING);
88 89
89 eet_eina_file_data_descriptor_class_set(&eddc, "Edje_Font_Directory", 90 eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc),
91 "Edje_Font_Directory",
90 sizeof (Old_Edje_Font_Directory)); 92 sizeof (Old_Edje_Font_Directory));
91 _edje_edd_old_edje_font_directory = 93 _edje_edd_old_edje_font_directory =
92 eet_data_descriptor_file_new(&eddc); 94 eet_data_descriptor_file_new(&eddc);