Bug 555779 – GtkCellRendererPixbuf crashed on failed GIcon lookup

2008-10-13  Matthias Clasen  <mclasen@redhat.com>

        Bug 555779 – GtkCellRendererPixbuf crashed on failed GIcon lookup

        * gtk/gtkcellrendererpixbuf
        (gtk_cell_renderer_pixbuf_create_themed_pixbuf): Don't crash
        if a GIcon is not present in the current theme. Patch by
        Alex Larsson.


svn path=/trunk/; revision=21650

ChangeLog

+2008-10-13  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 555779 – GtkCellRendererPixbuf crashed on failed GIcon lookup
+
+	* gtk/gtkcellrendererpixbuf
+	(gtk_cell_renderer_pixbuf_create_themed_pixbuf): Don't crash
+	if a GIcon is not present in the current theme. Patch by 
+	Alex Larsson.
+
 2008-10-13  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 552318 – menubar mnemonics consumed even when

gtk/gtkcellrendererpixbuf.c

@@ -454,8 +454,16 @@ gtk_cell_renderer_pixbuf_create_themed_pixbuf (GtkCellRendererPixbuf *cellpixbuf
                                              priv->gicon,
 			                     MIN (width, height), 
                                              GTK_ICON_LOOKUP_USE_BUILTIN);
-      cellpixbuf->pixbuf = gtk_icon_info_load_icon (info, &error);
-      gtk_icon_info_free (info);
+      if (!info)
+        {
+          g_set_error (&error, GTK_ICON_THEME_ERROR,  GTK_ICON_THEME_NOT_FOUND,
+                       _("Icon not present in theme"));
+        }
+      else
+        {
+          cellpixbuf->pixbuf = gtk_icon_info_load_icon (info, &error);
+          gtk_icon_info_free (info);
+        }
     }
 
   if (!cellpixbuf->pixbuf)