diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-10-21 16:58:29 (GMT) |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-10-21 16:58:29 (GMT) |
| commit | a093cd2a22173369424878eb6d8c38124e7aa1f9 (patch) | |
| tree | 318311038eedd167c92bc76243e7cdde209efd73 | |
| parent | bcc6979f8900dabe4646b22fe58c8d0bba0e1acf (diff) | |
| download | gtk+-a093cd2a22173369424878eb6d8c38124e7aa1f9.zip gtk+-a093cd2a22173369424878eb6d8c38124e7aa1f9.tar.xz | |
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.
| -rw-r--r-- | gtk/gtkicontheme.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 3fe95e7..5061cfe 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); |