diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-12-27 03:07:19 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-12-27 03:07:19 +0000 |
| commit | b9ff8712c8d37f60125ade640072110d7a0a082e (patch) | |
| tree | dbd8225b0c86fe4964b3cc99de73c311f30124d4 /gtk/gtkentry.c | |
| parent | 3276458c7b644716e17614cef65948d0c8adac75 (diff) | |
| download | gtk+-b9ff8712c8d37f60125ade640072110d7a0a082e.tar.gz | |
Allow builtin icons when loading themed icons, and don't leak a
2008-12-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c: Allow builtin icons when loading themed icons,
and don't leak a GtkIconInfo.
svn path=/trunk/; revision=21940
Diffstat (limited to 'gtk/gtkentry.c')
| -rw-r--r-- | gtk/gtkentry.c | 9 |
1 files changed, 7 insertions, 2 deletions
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, |