forked from enlightenment/efl
parent
ba3c69df53
commit
b6a8ffb13d
|
@ -69,13 +69,7 @@ cache_fallback_scan_dir(Eet_File *ef, Eina_Hash *dirs, const char *dir, int *cha
|
||||||
icon = NEW(Efreet_Cache_Icon, 1);
|
icon = NEW(Efreet_Cache_Icon, 1);
|
||||||
icon->free = 1;
|
icon->free = 1;
|
||||||
icon->fallback = 1;
|
icon->fallback = 1;
|
||||||
#if 0
|
|
||||||
icon->name = eina_stringshare_add(name);
|
|
||||||
#endif
|
|
||||||
icon->theme = NULL;
|
icon->theme = NULL;
|
||||||
#if 0
|
|
||||||
icon->context = dir->context;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
icon->icons = eina_list_append(icon->icons, eina_stringshare_ref(ent));
|
icon->icons = eina_list_append(icon->icons, eina_stringshare_ref(ent));
|
||||||
|
@ -157,13 +151,7 @@ cache_scan_path_dir(Efreet_Icon_Theme *theme, const char *path, Efreet_Icon_Them
|
||||||
{
|
{
|
||||||
icon = NEW(Efreet_Cache_Icon, 1);
|
icon = NEW(Efreet_Cache_Icon, 1);
|
||||||
icon->free = 1;
|
icon->free = 1;
|
||||||
#if 0
|
|
||||||
icon->name = eina_stringshare_add(name);
|
|
||||||
#endif
|
|
||||||
icon->theme = eina_stringshare_add(theme->name.internal);
|
icon->theme = eina_stringshare_add(theme->name.internal);
|
||||||
#if 0
|
|
||||||
icon->context = dir->context;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if (strcmp(icon->theme, theme->name.internal))
|
else if (strcmp(icon->theme, theme->name.internal))
|
||||||
{
|
{
|
||||||
|
|
|
@ -276,17 +276,8 @@ efreet_icon_edd_init(void)
|
||||||
if (!cache_icon_element_edd)
|
if (!cache_icon_element_edd)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
#if 0
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_edd, Efreet_Cache_Icon, "name", name, EET_T_STRING);
|
|
||||||
#endif
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_edd, Efreet_Cache_Icon, "theme", theme, EET_T_STRING);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_edd, Efreet_Cache_Icon, "theme", theme, EET_T_STRING);
|
||||||
#if 0
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_edd, Efreet_Cache_Icon, "context", context, EET_T_INT);
|
|
||||||
#endif
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_LIST(cache_icon_edd, Efreet_Cache_Icon, "icons", icons, cache_icon_element_edd);
|
EET_DATA_DESCRIPTOR_ADD_LIST(cache_icon_edd, Efreet_Cache_Icon, "icons", icons, cache_icon_element_edd);
|
||||||
#if 0
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_element_edd, Efreet_Cache_Icon_Element, "type", type, EET_T_INT);
|
|
||||||
#endif
|
|
||||||
eet_data_descriptor_element_add(cache_icon_element_edd, "paths", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Cache_Icon_Element, paths), 0, NULL, NULL);
|
eet_data_descriptor_element_add(cache_icon_element_edd, "paths", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Cache_Icon_Element, paths), 0, NULL, NULL);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_element_edd, Efreet_Cache_Icon_Element, "size.normal", size.normal, EET_T_USHORT);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_element_edd, Efreet_Cache_Icon_Element, "size.normal", size.normal, EET_T_USHORT);
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_element_edd, Efreet_Cache_Icon_Element, "size.min", size.min, EET_T_USHORT);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_element_edd, Efreet_Cache_Icon_Element, "size.min", size.min, EET_T_USHORT);
|
||||||
|
@ -313,11 +304,6 @@ efreet_icon_fallback_edd_init(void)
|
||||||
if (!cache_icon_fallback_edd)
|
if (!cache_icon_fallback_edd)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
#if 0
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_fallback_edd, Efreet_Cache_Icon, "name", name, EET_T_STRING);
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_fallback_edd, Efreet_Cache_Icon, "theme", theme, EET_T_STRING);
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_fallback_edd, Efreet_Cache_Icon, "context", context, EET_T_INT);
|
|
||||||
#endif
|
|
||||||
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_fallback_edd, Efreet_Cache_Icon, "fallback", fallback, EET_T_UCHAR);
|
EET_DATA_DESCRIPTOR_ADD_BASIC(cache_icon_fallback_edd, Efreet_Cache_Icon, "fallback", fallback, EET_T_UCHAR);
|
||||||
eet_data_descriptor_element_add(cache_icon_fallback_edd, "icons", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Cache_Icon, icons), 0, NULL, NULL);
|
eet_data_descriptor_element_add(cache_icon_fallback_edd, "icons", EET_T_STRING, EET_G_LIST, offsetof(Efreet_Cache_Icon, icons), 0, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
@ -397,12 +383,7 @@ efreet_cache_icon_free(Efreet_Cache_Icon *icon)
|
||||||
if (!icon) return;
|
if (!icon) return;
|
||||||
|
|
||||||
if (icon->free)
|
if (icon->free)
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
eina_stringshare_del(icon->name);
|
|
||||||
#endif
|
|
||||||
eina_stringshare_del(icon->theme);
|
eina_stringshare_del(icon->theme);
|
||||||
}
|
|
||||||
|
|
||||||
EINA_LIST_FREE(icon->icons, data)
|
EINA_LIST_FREE(icon->icons, data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -142,13 +142,7 @@ extern Eina_Hash *efreet_desktop_cache;
|
||||||
typedef struct Efreet_Cache_Icon Efreet_Cache_Icon;
|
typedef struct Efreet_Cache_Icon Efreet_Cache_Icon;
|
||||||
struct Efreet_Cache_Icon
|
struct Efreet_Cache_Icon
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
const char *name;
|
|
||||||
#endif
|
|
||||||
const char *theme;
|
const char *theme;
|
||||||
#if 0
|
|
||||||
int context; /* the type of icon */
|
|
||||||
#endif
|
|
||||||
Eina_List *icons;
|
Eina_List *icons;
|
||||||
unsigned char fallback;
|
unsigned char fallback;
|
||||||
unsigned char free:1;
|
unsigned char free:1;
|
||||||
|
|
Loading…
Reference in New Issue