timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: remove fdo caching and fallback code 

The hicolor fallback requirement is handled by efreet
and the usage of fdo is user specified now not by code.
This means the only (theoretical) way this could be a
problem is if the user removes a theme.
This seems like a good tradeoff to remove the overhead
and enable the apps to switch icons based on config change.
This commit is contained in:
Andy Williams 2016-04-28 15:31:55 +01:00
parent 3d0eff2199
commit fd422c48d1
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/elementary/elm_icon.c
View File

@ -11,7 +11,6 @@
#include "elm_widget_image.h"
#define NON_EXISTING (void *)-1
static const char *icon_theme = NULL;
#define MY_CLASS ELM_ICON_CLASS
#define MY_CLASS_NAME "Elm_Icon"
@ -270,35 +269,7 @@ _icon_freedesktop_set(Evas_Object *obj,
elm_need_efreet();
if (icon_theme == NON_EXISTING) return EINA_FALSE;
if (!icon_theme)
{
Efreet_Icon_Theme *theme;
/* TODO: Listen for EFREET_EVENT_ICON_CACHE_UPDATE */
theme = efreet_icon_theme_find(elm_config_icon_theme_get());
if (!theme)
{
const char **itr;
static const char *themes[] = {
"gnome", "Human", "oxygen", "hicolor", NULL
};
for (itr = themes; *itr; itr++)
{
theme = efreet_icon_theme_find(*itr);
if (theme) break;
}
}
if (!theme)
{
icon_theme = NON_EXISTING;
return EINA_FALSE;
}
else
icon_theme = eina_stringshare_add(theme->name.internal);
}
path = efreet_icon_path_find(icon_theme, name, size);
path = efreet_icon_path_find(elm_config_icon_theme_get(), name, size);
sd->freedesktop.use = !!path;
if (sd->freedesktop.use)
{