From 88966346df7eda2ef617815f46318e0d53df7d10 Mon Sep 17 00:00:00 2001 From: cedric Date: Fri, 13 Aug 2010 16:35:45 +0000 Subject: [PATCH] * edje: finally fix all this eet mess. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@51087 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/edje_cc_sources.c | 12 ++++++------ src/bin/edje_data_convert.c | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/bin/edje_cc_sources.c b/src/bin/edje_cc_sources.c index 6c3d3ed..5bbdd20 100644 --- a/src/bin/edje_cc_sources.c +++ b/src/bin/edje_cc_sources.c @@ -24,29 +24,29 @@ source_edd(void) { Eet_Data_Descriptor_Class eddc; - eet_eina_stream_data_descriptor_class_set(&eddc, "srcfile", sizeof (SrcFile)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "srcfile", sizeof (SrcFile)); _srcfile_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "name", name, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_srcfile_edd, SrcFile, "file", file, EET_T_INLINED_STRING); - eet_eina_stream_data_descriptor_class_set(&eddc, "srcfile_list", sizeof (SrcFile_List)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "srcfile_list", sizeof (SrcFile_List)); _srcfile_list_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd); - eet_eina_stream_data_descriptor_class_set(&eddc, "external", sizeof (External)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "external", sizeof (External)); _external_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_external_edd, External, "name", name, EET_T_INLINED_STRING); - eet_eina_stream_data_descriptor_class_set(&eddc, "external_list", sizeof (External_List)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "external_list", sizeof (External_List)); _external_list_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_external_list_edd, External_List, "list", list, _external_edd); - eet_eina_stream_data_descriptor_class_set(&eddc, "font", sizeof (Font)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "font", sizeof (Font)); _font_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "file", file, EET_T_INLINED_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_font_edd, Font, "name", name, EET_T_INLINED_STRING); - eet_eina_stream_data_descriptor_class_set(&eddc, "font_list", sizeof (Font_List)); + eet_eina_stream_data_descriptor_class_set(&eddc, sizeof (eddc), "font_list", sizeof (Font_List)); _font_list_edd = eet_data_descriptor_stream_new(&eddc); EET_DATA_DESCRIPTOR_ADD_LIST(_font_list_edd, Font_List, "list", list, _font_edd); } diff --git a/src/bin/edje_data_convert.c b/src/bin/edje_data_convert.c index 3ab8b2a..5fb129e 100644 --- a/src/bin/edje_data_convert.c +++ b/src/bin/edje_data_convert.c @@ -73,7 +73,8 @@ _edje_edd_old_init(void) eet_data_descriptor_file_new(&eddc); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_external_directory_entry, Edje_External_Directory_Entry, "entry", entry, EET_T_STRING); - eet_eina_file_data_descriptor_class_set(&eddc, "Edje_External_Directory", + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), + "Edje_External_Directory", sizeof (Old_Edje_External_Directory)); _edje_edd_old_edje_external_directory = eet_data_descriptor_file_new(&eddc); @@ -86,7 +87,8 @@ _edje_edd_old_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "entry", entry, EET_T_STRING); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_font_directory_entry, Edje_Font_Directory_Entry, "file", file, EET_T_STRING); - eet_eina_file_data_descriptor_class_set(&eddc, "Edje_Font_Directory", + eet_eina_file_data_descriptor_class_set(&eddc, sizeof (eddc), + "Edje_Font_Directory", sizeof (Old_Edje_Font_Directory)); _edje_edd_old_edje_font_directory = eet_data_descriptor_file_new(&eddc); -- 2.7.4