gtk+ r21940 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Dec 27 03:07:19 2008
New Revision: 21940
URL: http://svn.gnome.org/viewvc/gtk+?rev=21940&view=rev

Log:
2008-12-26  Matthias Clasen  <mclasen redhat com>

        * gtk/gtkentry.c: Allow builtin icons when loading themed icons,
        and don't leak a GtkIconInfo.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkentry.c

Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c	(original)
+++ trunk/gtk/gtkentry.c	Sat Dec 27 03:07:19 2008
@@ -6006,9 +6006,14 @@
 
           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,