forked from enlightenment/efl
patch from dfjoerg: search also pixmap dirs for icons
SVN revision: 42875
This commit is contained in:
parent
66c3cb0c22
commit
6a9f924640
|
@ -93,6 +93,11 @@ ef_cb_efreet_icon_theme_list(void)
|
|||
snprintf(buf, sizeof(buf), "%s/icons", dir);
|
||||
ef_icon_theme_themes_find(buf, dirs);
|
||||
}
|
||||
EINA_LIST_FOREACH(icon_dirs, l, dir)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%s/pixmaps", dir);
|
||||
ef_icon_theme_themes_find(buf, dirs);
|
||||
}
|
||||
ef_icon_theme_themes_find("/usr/share/pixmaps", dirs);
|
||||
|
||||
themes = efreet_icon_theme_list_get();
|
||||
|
|
|
@ -868,6 +868,17 @@ efreet_icon_fallback_icon(const char *icon_name)
|
|||
}
|
||||
}
|
||||
|
||||
EINA_LIST_FOREACH(xdg_dirs, l, dir)
|
||||
{
|
||||
snprintf(path, PATH_MAX, "%s/pixmaps", dir);
|
||||
icon = efreet_icon_fallback_dir_scan(path, icon_name);
|
||||
if (icon)
|
||||
{
|
||||
efreet_icon_cache_add(efreet_icon_find_theme_check(NULL), icon_name, 0, icon);
|
||||
return icon;
|
||||
}
|
||||
}
|
||||
|
||||
icon = efreet_icon_fallback_dir_scan("/usr/share/pixmaps", icon_name);
|
||||
}
|
||||
|
||||
|
@ -1258,6 +1269,12 @@ efreet_icon_theme_dir_scan_all(const char *theme_name)
|
|||
efreet_icon_theme_dir_scan(path, theme_name);
|
||||
}
|
||||
|
||||
EINA_LIST_FOREACH(xdg_dirs, l, dir)
|
||||
{
|
||||
snprintf(path, sizeof(path), "%s/pixmaps", dir);
|
||||
efreet_icon_theme_dir_scan(path, theme_name);
|
||||
}
|
||||
|
||||
efreet_icon_theme_dir_scan("/usr/share/pixmaps", theme_name);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue