forked from enlightenment/efl
rename struct
prepare for Efreet_Cache_Icon_Theme SVN revision: 55382
This commit is contained in:
parent
3e5887714b
commit
ed43ae5263
|
@ -340,7 +340,7 @@ main(int argc, char **argv)
|
||||||
* - make sure programs with different extra dirs all work together
|
* - make sure programs with different extra dirs all work together
|
||||||
*/
|
*/
|
||||||
Efreet_Cache_Version *version;
|
Efreet_Cache_Version *version;
|
||||||
Efreet_Cache_Theme *cache;
|
Efreet_Cache_Icons *cache;
|
||||||
Efreet_Icon_Theme *theme;
|
Efreet_Icon_Theme *theme;
|
||||||
Eet_Data_Descriptor *edd;
|
Eet_Data_Descriptor *edd;
|
||||||
Eet_File *ef;
|
Eet_File *ef;
|
||||||
|
@ -439,7 +439,7 @@ main(int argc, char **argv)
|
||||||
/* No existing cache before, so create it */
|
/* No existing cache before, so create it */
|
||||||
if (!cache)
|
if (!cache)
|
||||||
{
|
{
|
||||||
cache = NEW(Efreet_Cache_Theme, 1);
|
cache = NEW(Efreet_Cache_Icons, 1);
|
||||||
if (!cache) goto on_error_efreet;
|
if (!cache) goto on_error_efreet;
|
||||||
|
|
||||||
changed = EINA_TRUE;
|
changed = EINA_TRUE;
|
||||||
|
@ -476,7 +476,7 @@ main(int argc, char **argv)
|
||||||
/* No existing fallback, create it */
|
/* No existing fallback, create it */
|
||||||
if (!cache)
|
if (!cache)
|
||||||
{
|
{
|
||||||
cache = NEW(Efreet_Cache_Theme, 1);
|
cache = NEW(Efreet_Cache_Icons, 1);
|
||||||
if (!cache) goto on_error_efreet;
|
if (!cache) goto on_error_efreet;
|
||||||
|
|
||||||
changed = EINA_TRUE;
|
changed = EINA_TRUE;
|
||||||
|
|
|
@ -44,8 +44,8 @@ static Eet_Data_Descriptor *icon_edd;
|
||||||
static Eet_File *icon_cache = NULL;
|
static Eet_File *icon_cache = NULL;
|
||||||
|
|
||||||
static const char *theme_name = NULL;
|
static const char *theme_name = NULL;
|
||||||
static Efreet_Cache_Theme *theme_cache = NULL;
|
static Efreet_Cache_Icons *theme_cache = NULL;
|
||||||
static Efreet_Cache_Theme *fallback_cache = NULL;
|
static Efreet_Cache_Icons *fallback_cache = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static Eet_Data_Descriptor *version_edd = NULL;
|
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;
|
static Eina_List *old_desktop_caches = NULL;
|
||||||
|
|
||||||
#ifdef ICON_CACHE
|
#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
|
#endif
|
||||||
static void efreet_cache_edd_shutdown(void);
|
static void efreet_cache_edd_shutdown(void);
|
||||||
|
|
||||||
|
@ -306,8 +306,8 @@ efreet_cache_edd_shutdown(void)
|
||||||
"pointer", pointer, Edd_Source); \
|
"pointer", pointer, Edd_Source); \
|
||||||
}
|
}
|
||||||
|
|
||||||
static Efreet_Cache_Theme *
|
static Efreet_Cache_Icons *
|
||||||
_efreet_cache_free(Efreet_Cache_Theme *c)
|
_efreet_cache_free(Efreet_Cache_Icons *c)
|
||||||
{
|
{
|
||||||
if (!c) return NULL;
|
if (!c) return NULL;
|
||||||
|
|
||||||
|
@ -391,11 +391,11 @@ efreet_icon_theme_edd(Eina_Bool include_dirs)
|
||||||
theme_edd = eet_data_descriptor_file_new(&eddc);
|
theme_edd = eet_data_descriptor_file_new(&eddc);
|
||||||
if (!theme_edd) return NULL;
|
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);
|
"icons", icons, icon_edd);
|
||||||
|
|
||||||
if (include_dirs)
|
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());
|
"dirs", dirs, efreet_icon_directory_edd());
|
||||||
|
|
||||||
return theme_edd;
|
return theme_edd;
|
||||||
|
@ -437,11 +437,11 @@ efreet_icon_fallback_edd(Eina_Bool include_dirs)
|
||||||
fallback_edd = eet_data_descriptor_file_new(&eddc);
|
fallback_edd = eet_data_descriptor_file_new(&eddc);
|
||||||
if (!fallback_edd) return NULL;
|
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);
|
"icons", icons, icon_fallback_edd);
|
||||||
|
|
||||||
if (include_dirs)
|
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());
|
"dirs", dirs, efreet_icon_directory_edd());
|
||||||
|
|
||||||
return fallback_edd;
|
return fallback_edd;
|
||||||
|
|
|
@ -124,13 +124,13 @@ extern Eina_Hash *efreet_desktop_cache;
|
||||||
#define EFREET_ICON_CACHE_MAJOR 0
|
#define EFREET_ICON_CACHE_MAJOR 0
|
||||||
#define EFREET_ICON_CACHE_MINOR 4
|
#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_Directory Efreet_Cache_Directory;
|
||||||
typedef struct _Efreet_Cache_Icon Efreet_Cache_Icon;
|
typedef struct _Efreet_Cache_Icon Efreet_Cache_Icon;
|
||||||
typedef struct _Efreet_Cache_Icon_Element Efreet_Cache_Icon_Element;
|
typedef struct _Efreet_Cache_Icon_Element Efreet_Cache_Icon_Element;
|
||||||
typedef struct _Efreet_Cache_Fallback_Icon Efreet_Cache_Fallback_Icon;
|
typedef struct _Efreet_Cache_Fallback_Icon Efreet_Cache_Fallback_Icon;
|
||||||
|
|
||||||
struct _Efreet_Cache_Theme
|
struct _Efreet_Cache_Icons
|
||||||
{
|
{
|
||||||
Eina_Hash *icons;
|
Eina_Hash *icons;
|
||||||
Eina_Hash *dirs;
|
Eina_Hash *dirs;
|
||||||
|
|
|
@ -27,7 +27,7 @@ int verbose = 0;
|
||||||
static void
|
static void
|
||||||
dump(Efreet_Icon_Theme *theme, Eet_File *ef)
|
dump(Efreet_Icon_Theme *theme, Eet_File *ef)
|
||||||
{
|
{
|
||||||
Efreet_Cache_Theme *cache;
|
Efreet_Cache_Icons *cache;
|
||||||
Eina_Iterator *it;
|
Eina_Iterator *it;
|
||||||
const char *key;
|
const char *key;
|
||||||
unsigned int count = 0;
|
unsigned int count = 0;
|
||||||
|
|
Loading…
Reference in New Issue