diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-01-03 14:44:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-01-03 14:44:33 +0000 |
| commit | 35dfce0f90d663589d63566fe9248ac044712a09 (patch) | |
| tree | e1050ac88bed7311a7e94c7d07023a4404deb431 /gtk/gtkicontheme.c | |
| parent | 27c23e4dd591499da4dccf6875e100aa8bdc2c56 (diff) | |
| download | gdk-pixbuf-35dfce0f90d663589d63566fe9248ac044712a09.tar.gz | |
Make gtk_icon_theme_load_icon() work independent of icon factory
2005-01-03 Matthias Clasen <mclasen@redhat.com>
Make gtk_icon_theme_load_icon() work independent of
icon factory initialization. (#162791, Tristan Van Berkom)
* gtk/gtkiconfactory.[hc]: Rename ensure_default_icons to
_gtk_icon_factory_ensure_default_icons, and make it non-static.
* gtk/gtkicontheme.c (find_builtin_icon): ..and call it here.
Diffstat (limited to 'gtk/gtkicontheme.c')
| -rw-r--r-- | gtk/gtkicontheme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 86704f45d..ca6ef338f 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -37,6 +37,7 @@ #endif /* G_OS_WIN32 */ #include "gtkicontheme.h" +#include "gtkiconfactory.h" #include "gtkiconcache.h" #include "gtkintl.h" #include "gtksettings.h" @@ -2872,6 +2873,8 @@ find_builtin_icon (const gchar *icon_name, gboolean has_larger = FALSE; BuiltinIcon *min_icon = NULL; + _gtk_icon_factory_ensure_default_icons (); + if (!icon_theme_builtin_icons) return NULL; |