From b9ff8712c8d37f60125ade640072110d7a0a082e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 27 Dec 2008 03:07:19 +0000 Subject: Allow builtin icons when loading themed icons, and don't leak a 2008-12-26 Matthias Clasen * gtk/gtkentry.c: Allow builtin icons when loading themed icons, and don't leak a GtkIconInfo. svn path=/trunk/; revision=21940 --- gtk/gtkentry.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gtk/gtkentry.c') diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 1b5fa48f34..2c30be703e 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -6006,9 +6006,14 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry, info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon_info->gicon, - MIN (width, height), 0); + MIN (width, height), + GTK_ICON_LOOKUP_USE_BUILTIN); + if (info) + { + icon_info->pixbuf = gtk_icon_info_load_icon (info, NULL); + gtk_icon_info_free (info); + } - icon_info->pixbuf = gtk_icon_info_load_icon (info, NULL); if (icon_info->pixbuf == NULL) icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), GTK_STOCK_MISSING_IMAGE, -- cgit v1.2.1