From a093cd2a22173369424878eb6d8c38124e7aa1f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Oct 2013 12:58:29 -0400 Subject: [PATCH] Icon theme: Hardcode fallback through the 'gnome' icon theme This is what we used to get through the Net/FallbackIcontheme setting. Nobody has ever set this setting to a different value, and people have come to rely on GTK+ applications getting their icons this way. --- gtk/gtkicontheme.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 3fe95e77d1..5061cfed6d 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1255,7 +1255,12 @@ load_themes (GtkIconTheme *icon_theme) if (priv->current_theme) insert_theme (icon_theme, priv->current_theme); - /* Always look in the "default" icon theme */ + /* Always look in the gnome and hicolor icon themes. + * Looking in hicolor is mandated by the spec, looking + * in gnome is a pragmatic solution to prevent missing + * icons in GTK+ applications when run under, e.g. KDE. + */ + insert_theme (icon_theme, "gnome"); insert_theme (icon_theme, DEFAULT_THEME_NAME); priv->themes = g_list_reverse (priv->themes);