From ed43ae5263862f958e8c3137b67cbabc32536eb2 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Wed, 8 Dec 2010 21:36:54 +0000 Subject: [PATCH] rename struct prepare for Efreet_Cache_Icon_Theme SVN revision: 55382 --- .../efreet/src/bin/efreet_icon_cache_create.c | 6 +++--- legacy/efreet/src/lib/efreet_cache.c | 18 +++++++++--------- legacy/efreet/src/lib/efreet_private.h | 4 ++-- .../efreet/src/tests/efreet_icon_cache_dump.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/legacy/efreet/src/bin/efreet_icon_cache_create.c index 572201cb51..adb59d696f 100644 --- a/legacy/efreet/src/bin/efreet_icon_cache_create.c +++ b/legacy/efreet/src/bin/efreet_icon_cache_create.c @@ -340,7 +340,7 @@ main(int argc, char **argv) * - make sure programs with different extra dirs all work together */ Efreet_Cache_Version *version; - Efreet_Cache_Theme *cache; + Efreet_Cache_Icons *cache; Efreet_Icon_Theme *theme; Eet_Data_Descriptor *edd; Eet_File *ef; @@ -439,7 +439,7 @@ main(int argc, char **argv) /* No existing cache before, so create it */ if (!cache) { - cache = NEW(Efreet_Cache_Theme, 1); + cache = NEW(Efreet_Cache_Icons, 1); if (!cache) goto on_error_efreet; changed = EINA_TRUE; @@ -476,7 +476,7 @@ main(int argc, char **argv) /* No existing fallback, create it */ if (!cache) { - cache = NEW(Efreet_Cache_Theme, 1); + cache = NEW(Efreet_Cache_Icons, 1); if (!cache) goto on_error_efreet; changed = EINA_TRUE; diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c index d590d18555..b38b28878f 100644 --- a/legacy/efreet/src/lib/efreet_cache.c +++ b/legacy/efreet/src/lib/efreet_cache.c @@ -44,8 +44,8 @@ static Eet_Data_Descriptor *icon_edd; static Eet_File *icon_cache = NULL; static const char *theme_name = NULL; -static Efreet_Cache_Theme *theme_cache = NULL; -static Efreet_Cache_Theme *fallback_cache = NULL; +static Efreet_Cache_Icons *theme_cache = NULL; +static Efreet_Cache_Icons *fallback_cache = NULL; #endif static Eet_Data_Descriptor *version_edd = NULL; @@ -70,7 +70,7 @@ static int desktop_cache_exe_lock = -1; static Eina_List *old_desktop_caches = NULL; #ifdef ICON_CACHE -static Efreet_Cache_Theme *_efreet_cache_free(Efreet_Cache_Theme *cache); +static Efreet_Cache_Icons *_efreet_cache_free(Efreet_Cache_Icons *cache); #endif static void efreet_cache_edd_shutdown(void); @@ -306,8 +306,8 @@ efreet_cache_edd_shutdown(void) "pointer", pointer, Edd_Source); \ } -static Efreet_Cache_Theme * -_efreet_cache_free(Efreet_Cache_Theme *c) +static Efreet_Cache_Icons * +_efreet_cache_free(Efreet_Cache_Icons *c) { if (!c) return NULL; @@ -391,11 +391,11 @@ efreet_icon_theme_edd(Eina_Bool include_dirs) theme_edd = eet_data_descriptor_file_new(&eddc); if (!theme_edd) return NULL; - EET_DATA_DESCRIPTOR_ADD_HASH(theme_edd, Efreet_Cache_Theme, + EET_DATA_DESCRIPTOR_ADD_HASH(theme_edd, Efreet_Cache_Icons, "icons", icons, icon_edd); if (include_dirs) - EET_DATA_DESCRIPTOR_ADD_HASH(theme_edd, Efreet_Cache_Theme, + EET_DATA_DESCRIPTOR_ADD_HASH(theme_edd, Efreet_Cache_Icons, "dirs", dirs, efreet_icon_directory_edd()); return theme_edd; @@ -437,11 +437,11 @@ efreet_icon_fallback_edd(Eina_Bool include_dirs) fallback_edd = eet_data_descriptor_file_new(&eddc); if (!fallback_edd) return NULL; - EET_DATA_DESCRIPTOR_ADD_HASH(fallback_edd, Efreet_Cache_Theme, + EET_DATA_DESCRIPTOR_ADD_HASH(fallback_edd, Efreet_Cache_Icons, "icons", icons, icon_fallback_edd); if (include_dirs) - EET_DATA_DESCRIPTOR_ADD_HASH(fallback_edd, Efreet_Cache_Theme, + EET_DATA_DESCRIPTOR_ADD_HASH(fallback_edd, Efreet_Cache_Icons, "dirs", dirs, efreet_icon_directory_edd()); return fallback_edd; diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h index 33395a6eff..cf6b8f325a 100644 --- a/legacy/efreet/src/lib/efreet_private.h +++ b/legacy/efreet/src/lib/efreet_private.h @@ -124,13 +124,13 @@ extern Eina_Hash *efreet_desktop_cache; #define EFREET_ICON_CACHE_MAJOR 0 #define EFREET_ICON_CACHE_MINOR 4 -typedef struct _Efreet_Cache_Theme Efreet_Cache_Theme; +typedef struct _Efreet_Cache_Icons Efreet_Cache_Icons; typedef struct _Efreet_Cache_Directory Efreet_Cache_Directory; typedef struct _Efreet_Cache_Icon Efreet_Cache_Icon; typedef struct _Efreet_Cache_Icon_Element Efreet_Cache_Icon_Element; typedef struct _Efreet_Cache_Fallback_Icon Efreet_Cache_Fallback_Icon; -struct _Efreet_Cache_Theme +struct _Efreet_Cache_Icons { Eina_Hash *icons; Eina_Hash *dirs; diff --git a/legacy/efreet/src/tests/efreet_icon_cache_dump.c b/legacy/efreet/src/tests/efreet_icon_cache_dump.c index 31cb934b72..3a1d9dd531 100644 --- a/legacy/efreet/src/tests/efreet_icon_cache_dump.c +++ b/legacy/efreet/src/tests/efreet_icon_cache_dump.c @@ -27,7 +27,7 @@ int verbose = 0; static void dump(Efreet_Icon_Theme *theme, Eet_File *ef) { - Efreet_Cache_Theme *cache; + Efreet_Cache_Icons *cache; Eina_Iterator *it; const char *key; unsigned int count = 0;