Commit b9ff8712 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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
parent 3276458c
2008-12-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c: Allow builtin icons when loading themed icons,
and don't leak a GtkIconInfo.
2008-12-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c: Emit ::icon-pressed regardless which button was
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment