simplify code

SVN revision: 55262
This commit is contained in:
Sebastian Dransfeld 2010-12-04 15:13:47 +00:00
parent 802339c2c0
commit 649aa06958
1 changed files with 10 additions and 15 deletions

View File

@ -419,33 +419,28 @@ efreet_icon_path_find(const char *theme_name, const char *icon, unsigned int siz
if (theme) if (theme)
{ {
char *tmp;
#ifdef ICON_CACHE #ifdef ICON_CACHE
Efreet_Cache_Icon *cache; Efreet_Cache_Icon *cache;
#endif #endif
#ifdef SLOPPY_SPEC #ifdef SLOPPY_SPEC
{ tmp = efreet_icon_remove_extension(icon);
char *tmp; if (!tmp) return NULL;
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);
#else #else
value = efreet_icon_find_helper(theme, tmp, size); tmp = icon;
#endif #endif
FREE(tmp);
}
#else
#ifdef ICON_CACHE #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); value = efreet_cache_icon_lookup_icon(cache, size);
if (!value) INFO("lookup for `%s` failed in theme `%s` with %p.", icon, theme_name, cache); if (!value) INFO("lookup for `%s` failed in theme `%s` with %p.", icon, theme_name, cache);
#else #else
value = efreet_icon_find_helper(theme, icon, size); value = efreet_icon_find_helper(theme, tmp, size);
#endif #endif
#ifdef SLOPPY_SPEC
FREE(tmp);
#endif #endif
} }