diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c index 426b55f789..98ab895b56 100644 --- a/legacy/efreet/src/lib/efreet_cache.c +++ b/legacy/efreet/src/lib/efreet_cache.c @@ -573,34 +573,6 @@ efreet_desktop_edd(void) return desktop_edd; } -static void -efreet_cache_icon_free(Efreet_Cache_Icon *icon) -{ - unsigned int i; - - if (!icon) return; - if (icon == NON_EXISTING) return; - - for (i = 0; i < icon->icons_count; ++i) - { - free(icon->icons[i]->paths); - free(icon->icons[i]); - } - - free(icon->icons); - free(icon); -} - -static void -efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon) -{ - if (!icon) return; - if (icon == NON_EXISTING) return; - - free(icon->icons); - free(icon); -} - Efreet_Cache_Icon * efreet_cache_icon_find(Efreet_Icon_Theme *theme, const char *icon) { @@ -673,6 +645,34 @@ efreet_cache_icon_theme_find(const char *theme) return NULL; } +static void +efreet_cache_icon_free(Efreet_Cache_Icon *icon) +{ + unsigned int i; + + if (!icon) return; + if (icon == NON_EXISTING) return; + + for (i = 0; i < icon->icons_count; ++i) + { + free(icon->icons[i]->paths); + free(icon->icons[i]); + } + + free(icon->icons); + free(icon); +} + +static void +efreet_cache_icon_fallback_free(Efreet_Cache_Fallback_Icon *icon) +{ + if (!icon) return; + if (icon == NON_EXISTING) return; + + free(icon->icons); + free(icon); +} + static void efreet_cache_icon_theme_free(Efreet_Icon_Theme *theme) { @@ -739,26 +739,6 @@ efreet_cache_desktop_find(const char *file) return desktop; } -void -efreet_cache_desktop_update(void) -{ - if (!efreet_cache_update) return; - - /* TODO: Make sure we don't create a lot of execs, maybe use a timer? */ - if (desktop_cache_job) ecore_job_del(desktop_cache_job); - desktop_cache_job = ecore_job_add(desktop_cache_update_cache_job, NULL); -} - -void -efreet_cache_icon_update(void) -{ - if (!efreet_cache_update) return; - - /* TODO: Make sure we don't create a lot of execs, maybe use a timer? */ - if (icon_cache_job) ecore_job_del(icon_cache_job); - icon_cache_job = ecore_job_add(icon_cache_update_cache_job, NULL); -} - void efreet_cache_desktop_free(Efreet_Desktop *desktop) { @@ -784,6 +764,26 @@ efreet_cache_desktop_free(Efreet_Desktop *desktop) } } +void +efreet_cache_desktop_update(void) +{ + if (!efreet_cache_update) return; + + /* TODO: Make sure we don't create a lot of execs, maybe use a timer? */ + if (desktop_cache_job) ecore_job_del(desktop_cache_job); + desktop_cache_job = ecore_job_add(desktop_cache_update_cache_job, NULL); +} + +void +efreet_cache_icon_update(void) +{ + if (!efreet_cache_update) return; + + /* TODO: Make sure we don't create a lot of execs, maybe use a timer? */ + if (icon_cache_job) ecore_job_del(icon_cache_job); + icon_cache_job = ecore_job_add(icon_cache_update_cache_job, NULL); +} + Eina_Bool efreet_cache_check(Eet_File **ef, const char *path, int major) {