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/gtkiconfactory.c | |
| parent | 27c23e4dd591499da4dccf6875e100aa8bdc2c56 (diff) | |
| download | gtk+-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/gtkiconfactory.c')
| -rw-r--r-- | gtk/gtkiconfactory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index ceec68cb50..74be267e84 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -304,8 +304,8 @@ gtk_icon_factory_remove_default (GtkIconFactory *factory) g_object_unref (factory); } -static void -ensure_default_icons (void) +void +_gtk_icon_factory_ensure_default_icons (void) { if (gtk_default_icons == NULL) { @@ -348,7 +348,7 @@ gtk_icon_factory_lookup_default (const gchar *stock_id) tmp_list = g_slist_next (tmp_list); } - ensure_default_icons (); + _gtk_icon_factory_ensure_default_icons (); return gtk_icon_factory_lookup (gtk_default_icons, stock_id); } @@ -2938,7 +2938,7 @@ _gtk_icon_factory_list_ids (void) ids = NULL; - ensure_default_icons (); + _gtk_icon_factory_ensure_default_icons (); tmp_list = all_icon_factories; while (tmp_list != NULL) |