From c8af2396928fa0c9175dc1f19ce287bd25dcca90 Mon Sep 17 00:00:00 2001 From: jeffdameth Date: Sun, 4 Oct 2009 21:55:13 +0000 Subject: [PATCH] patch from dfjoerg: search also pixmap dirs for icons git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/efreet@42875 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/ef_icon_theme.c | 5 +++++ src/lib/efreet_icon.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/bin/ef_icon_theme.c b/src/bin/ef_icon_theme.c index 4d8f870..769f735 100644 --- a/src/bin/ef_icon_theme.c +++ b/src/bin/ef_icon_theme.c @@ -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(); diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c index 5913822..d506044 100644 --- a/src/lib/efreet_icon.c +++ b/src/lib/efreet_icon.c @@ -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); } -- 2.7.4