enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

rename struct 

prepare for Efreet_Cache_Icon_Theme

SVN revision: 55382
This commit is contained in:
Sebastian Dransfeld 2010-12-08 21:36:54 +00:00
parent 3e5887714b
commit ed43ae5263
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/efreet/src/bin/efreet_icon_cache_create.c
View File

@ -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;

18
legacy/efreet/src/lib/efreet_cache.c
View File

@ -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;

4
legacy/efreet/src/lib/efreet_private.h
View File

@ -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;

2
legacy/efreet/src/tests/efreet_icon_cache_dump.c
View File

@ -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;