From b6a8ffb13d14b2b2d00225019f75d8c79b0bb060 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Wed, 24 Nov 2010 19:37:01 +0000 Subject: [PATCH] remove unneeded code SVN revision: 54949 --- .../efreet/src/bin/efreet_icon_cache_create.c | 12 ------------ legacy/efreet/src/lib/efreet_cache.c | 19 ------------------- legacy/efreet/src/lib/efreet_private.h | 6 ------ 3 files changed, 37 deletions(-) diff --git a/legacy/efreet/src/bin/efreet_icon_cache_create.c b/legacy/efreet/src/bin/efreet_icon_cache_create.c index d32c360142..4fe4f90358 100644 --- a/legacy/efreet/src/bin/efreet_icon_cache_create.c +++ b/legacy/efreet/src/bin/efreet_icon_cache_create.c @@ -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->free = 1; icon->fallback = 1; -#if 0 - icon->name = eina_stringshare_add(name); -#endif icon->theme = NULL; -#if 0 - icon->context = dir->context; -#endif } 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->free = 1; -#if 0 - icon->name = eina_stringshare_add(name); -#endif icon->theme = eina_stringshare_add(theme->name.internal); -#if 0 - icon->context = dir->context; -#endif } else if (strcmp(icon->theme, theme->name.internal)) { diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c index 3c44ea4fce..4de488051f 100644 --- a/legacy/efreet/src/lib/efreet_cache.c +++ b/legacy/efreet/src/lib/efreet_cache.c @@ -276,17 +276,8 @@ efreet_icon_edd_init(void) if (!cache_icon_element_edd) 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); -#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); -#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_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); @@ -313,11 +304,6 @@ efreet_icon_fallback_edd_init(void) if (!cache_icon_fallback_edd) 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_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->free) - { -#if 0 - eina_stringshare_del(icon->name); -#endif eina_stringshare_del(icon->theme); - } EINA_LIST_FREE(icon->icons, data) { diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h index 1c8d6620df..eef8022de3 100644 --- a/legacy/efreet/src/lib/efreet_private.h +++ b/legacy/efreet/src/lib/efreet_private.h @@ -142,13 +142,7 @@ extern Eina_Hash *efreet_desktop_cache; typedef struct Efreet_Cache_Icon Efreet_Cache_Icon; struct Efreet_Cache_Icon { -#if 0 - const char *name; -#endif const char *theme; -#if 0 - int context; /* the type of icon */ -#endif Eina_List *icons; unsigned char fallback; unsigned char free:1;