AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Make gtk_icon_theme_load_icon() work independent of icon factory

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2005-01-03 14:44:33 +00:00 committed by Matthias Clasen
parent 27c23e4dd5
commit 35dfce0f90
7 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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.
2005-01-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_remove_shortcut_folder):

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
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.
2005-01-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_remove_shortcut_folder):

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
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.
2005-01-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_remove_shortcut_folder):

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
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.
2005-01-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_remove_shortcut_folder):

8
gtk/gtkiconfactory.c
View File

@ -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)

1
gtk/gtkiconfactory.h
View File

@ -180,6 +180,7 @@ GtkIconSize gtk_icon_source_get_size (const GtkIconSource *
/* ignore this */
void _gtk_icon_set_invalidate_caches (void);
GSList* _gtk_icon_factory_list_ids (void);
void _gtk_icon_factory_ensure_default_icons (void);
#ifdef __cplusplus
}

3
gtk/gtkicontheme.c
View File

@ -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;