callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export this privately.

Browse Source 
2006-07-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.h:
	* gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache):
	Export this privately.

	* gtk/gtkiconfactory.c (render_fallback_image): And call it
	here to initialize the builtin cache before using it.  (#348063,
	Diego Pettenò)
This commit is contained in:
Matthias Clasen
2006-07-20 18:07:21 +00:00
committed by Matthias Clasen
parent 066bb1b8f6
commit 7014a3b5bb
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.h:
* gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache):
Export this privately.
* gtk/gtkiconfactory.c (render_fallback_image): And call it
here to initialize the builtin cache before using it. (#348063,
Diego Pettenò)
2006-07-19 Federico Mena Quintero <federico@novell.com> 2006-07-19 Federico Mena Quintero <federico@novell.com>
* tests/autotestfilechooser.c (test_black_box): Argh, initialize * tests/autotestfilechooser.c (test_black_box): Argh, initialize

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2006-07-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.h:
* gtk/gtkicontheme.c (_gtk_icon_theme_ensure_builtin_cache):
Export this privately.
* gtk/gtkiconfactory.c (render_fallback_image): And call it
here to initialize the builtin cache before using it. (#348063,
Diego Pettenò)
2006-07-19 Federico Mena Quintero <federico@novell.com> 2006-07-19 Federico Mena Quintero <federico@novell.com>
* tests/autotestfilechooser.c (test_black_box): Argh, initialize * tests/autotestfilechooser.c (test_black_box): Argh, initialize

10
gtk/gtkiconfactory.c
View File

@ -1566,9 +1566,13 @@ render_fallback_image (GtkStyle *style,
if (fallback_source.type == GTK_ICON_SOURCE_EMPTY) if (fallback_source.type == GTK_ICON_SOURCE_EMPTY)
{ {
GdkPixbuf *pixbuf = _gtk_icon_cache_get_icon (_builtin_cache, GdkPixbuf *pixbuf;
GTK_STOCK_MISSING_IMAGE,
"24"); _gtk_icon_theme_ensure_builtin_cache ();
pixbuf = _gtk_icon_cache_get_icon (_builtin_cache,
GTK_STOCK_MISSING_IMAGE,
"24");
gtk_icon_source_set_pixbuf (&fallback_source, pixbuf); gtk_icon_source_set_pixbuf (&fallback_source, pixbuf);
g_object_unref (pixbuf); g_object_unref (pixbuf);
} }

2
gtk/gtkicontheme.c
View File

@ -1129,7 +1129,7 @@ load_themes (GtkIconTheme *icon_theme)
priv->last_stat_time = tv.tv_sec; priv->last_stat_time = tv.tv_sec;
} }
static void void
_gtk_icon_theme_ensure_builtin_cache (void) _gtk_icon_theme_ensure_builtin_cache (void)
{ {
static gboolean initialized = FALSE; static gboolean initialized = FALSE;

1
gtk/gtkicontheme.h
View File

@ -169,6 +169,7 @@ G_CONST_RETURN gchar *gtk_icon_info_get_display_name (GtkIconInfo *icon_info)
/* Non-public methods */ /* Non-public methods */
void _gtk_icon_theme_check_reload (GdkDisplay *display); void _gtk_icon_theme_check_reload (GdkDisplay *display);
void _gtk_icon_theme_ensure_builtin_cache (void);
G_END_DECLS G_END_DECLS