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

Allow builtin icons when loading themed icons, and don't leak a

Browse Source 
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
This commit is contained in:
Matthias Clasen 2008-12-27 03:07:19 +00:00 committed by Matthias Clasen
parent 3276458c7b
commit b9ff8712c8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2008-12-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentry.c: Emit ::icon-pressed regardless which button was * gtk/gtkentry.c: Emit ::icon-pressed regardless which button was

9
gtk/gtkentry.c
View File

@ -6006,9 +6006,14 @@ gtk_entry_ensure_pixbuf (GtkEntry *entry,
info = gtk_icon_theme_lookup_by_gicon (icon_theme, info = gtk_icon_theme_lookup_by_gicon (icon_theme,
icon_info->gicon, 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) if (icon_info->pixbuf == NULL)
icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry), icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
GTK_STOCK_MISSING_IMAGE, GTK_STOCK_MISSING_IMAGE,