From: Enlightenment S. <no-...@en...> - 2010-02-04 20:02:46
|
Log: Remove raster's stupid cache And just disable cache limit on the already existing cache. Author: englebass Date: 2010-02-04 12:02:33 -0800 (Thu, 04 Feb 2010) New Revision: 45881 Removed: trunk/efreet/src/lib/efreet_cache.c Modified: trunk/efreet/src/lib/Makefile.am trunk/efreet/src/lib/efreet_icon.c trunk/efreet/src/lib/efreet_private.h trunk/efreet/src/lib/efreet_utils.c Modified: trunk/efreet/src/lib/Makefile.am =================================================================== --- trunk/efreet/src/lib/Makefile.am 2010-02-04 18:34:44 UTC (rev 45880) +++ trunk/efreet/src/lib/Makefile.am 2010-02-04 20:02:33 UTC (rev 45881) @@ -22,8 +22,7 @@ efreet_desktop.c \ efreet_menu.c \ efreet_utils.c \ -efreet_uri.c \ -efreet_cache.c +efreet_uri.c installed_headersdir = $(includedir)/efreet Modified: trunk/efreet/src/lib/efreet_icon.c =================================================================== --- trunk/efreet/src/lib/efreet_icon.c 2010-02-04 18:34:44 UTC (rev 45880) +++ trunk/efreet/src/lib/efreet_icon.c 2010-02-04 20:02:33 UTC (rev 45881) @@ -368,15 +368,9 @@ EAPI char * efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int size) { - const char *cached; char *value; Efreet_Icon_Theme *theme; - if ((cached = efreet_icon_hash_get(theme_name, icon, size)) != NULL) - { - if (cached == NON_EXISTING) return NULL; - return strdup(cached); - } theme = efreet_icon_find_theme_check(theme_name); #ifdef SLOPPY_SPEC @@ -396,8 +390,6 @@ */ if (!value || (value == NON_EXISTING)) value = efreet_icon_fallback_icon(icon); - efreet_icon_hash_put(theme_name, icon, size, value); - if (value == NON_EXISTING) value = NULL; return value; } @@ -1637,5 +1629,5 @@ if (!l) eina_hash_add(efreet_icon_cache, theme, list); else eina_hash_modify(efreet_icon_cache, theme, list); - efreet_icon_cache_flush(theme, list); + //efreet_icon_cache_flush(theme, list); } Modified: trunk/efreet/src/lib/efreet_private.h =================================================================== --- trunk/efreet/src/lib/efreet_private.h 2010-02-04 18:34:44 UTC (rev 45880) +++ trunk/efreet/src/lib/efreet_private.h 2010-02-04 20:02:33 UTC (rev 45881) @@ -199,10 +199,6 @@ #define NON_EXISTING (void *)-1 -void efreet_cache_clear(void); -const char *efreet_icon_hash_get(const char *theme_name, const char *icon, int size); -void efreet_icon_hash_put(const char *theme_name, const char *icon, int size, const char *file); - /** * @} */ Modified: trunk/efreet/src/lib/efreet_utils.c =================================================================== --- trunk/efreet/src/lib/efreet_utils.c 2010-02-04 18:34:44 UTC (rev 45880) +++ trunk/efreet/src/lib/efreet_utils.c 2010-02-04 20:02:33 UTC (rev 45881) @@ -570,7 +570,6 @@ free(fill); idler = NULL; fill = NULL; - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, NULL, NULL, NULL); return 0; @@ -596,7 +595,6 @@ eina_hash_foreach(file_id_by_desktop_path, dump, NULL); DBG("%d", eina_hash_population(desktop_by_file_id)); #endif - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, NULL, NULL, NULL); return 0; @@ -702,7 +700,6 @@ ev->current = desktop; efreet_desktop_ref(ev->current); ev->change = EFREET_DESKTOP_CHANGE_ADD; - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); } } @@ -723,7 +720,6 @@ ev->change = EFREET_DESKTOP_CHANGE_UPDATE; efreet_desktop_free(ud->desktop); ud->desktop = desktop; - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); } else @@ -755,7 +751,6 @@ ev->current = ud->desktop; efreet_desktop_ref(ev->current); ev->change = EFREET_DESKTOP_CHANGE_REMOVE; - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); eina_hash_del(desktop_by_file_id, file_id, ud); @@ -804,7 +799,6 @@ ev->previous = ud->desktop; efreet_desktop_ref(ev->previous); ev->change = EFREET_DESKTOP_CHANGE_UPDATE; - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); efreet_desktop_free(ud->desktop); @@ -826,7 +820,6 @@ ev->current = desktop; efreet_desktop_ref(ev->current); ev->change = EFREET_DESKTOP_CHANGE_ADD; - efreet_cache_clear(); ecore_event_add(EFREET_EVENT_DESKTOP_CHANGE, ev, efreet_event_desktop_change_free, NULL); } } |