From 649aa06958ac03390782240a5f2e2d4b88bb411c Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Sat, 4 Dec 2010 15:13:47 +0000 Subject: [PATCH] simplify code SVN revision: 55262 --- legacy/efreet/src/lib/efreet_icon.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c index cb54d98ca5..1fad0112dd 100644 --- a/legacy/efreet/src/lib/efreet_icon.c +++ b/legacy/efreet/src/lib/efreet_icon.c @@ -419,33 +419,28 @@ efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int siz if (theme) { + char *tmp; #ifdef ICON_CACHE Efreet_Cache_Icon *cache; #endif #ifdef SLOPPY_SPEC - { - char *tmp; - - tmp = efreet_icon_remove_extension(icon); - if (!tmp) return NULL; -#ifdef ICON_CACHE - cache = efreet_cache_icon_find(theme, tmp); - value = efreet_cache_icon_lookup_icon(cache, size); - if (!value) INFO("lookup for `%s` failed in theme `%s` with %p.", icon, theme_name, cache); + tmp = efreet_icon_remove_extension(icon); + if (!tmp) return NULL; #else - value = efreet_icon_find_helper(theme, tmp, size); + tmp = icon; #endif - FREE(tmp); - } -#else + #ifdef ICON_CACHE - cache = efreet_cache_icon_find(theme, icon); + cache = efreet_cache_icon_find(theme, tmp); value = efreet_cache_icon_lookup_icon(cache, size); if (!value) INFO("lookup for `%s` failed in theme `%s` with %p.", icon, theme_name, cache); #else - value = efreet_icon_find_helper(theme, icon, size); + value = efreet_icon_find_helper(theme, tmp, size); #endif + +#ifdef SLOPPY_SPEC + FREE(tmp); #endif }