gtk+ r20696 - in trunk: . gtk

[carlosg svn gnome org]

Author: carlosg
Date: Fri Jun 27 15:33:42 2008
New Revision: 20696
URL: http://svn.gnome.org/viewvc/gtk+?rev=20696&view=rev

Log:
2008-06-27  Carlos Garnacho  <carlos imendio com>

        * gtk/gtkrecentmanager.c (get_icon_for_mime_type): Fix two potential
        critical warnings. Bug #539470.


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

Modified: trunk/gtk/gtkrecentmanager.c
==============================================================================
--- trunk/gtk/gtkrecentmanager.c	(original)
+++ trunk/gtk/gtkrecentmanager.c	Fri Jun 27 15:33:42 2008
@@ -1889,15 +1889,22 @@
   icon_theme = gtk_icon_theme_get_default ();
 
   content_type = g_content_type_from_mime_type (mime_type);
+
+  if (!content_type)
+    return NULL;
+
   icon = g_content_type_get_icon (content_type);
   info = gtk_icon_theme_lookup_by_gicon (icon_theme, 
                                          icon, 
                                          pixel_size, 
                                          GTK_ICON_LOOKUP_USE_BUILTIN);
-  pixbuf = gtk_icon_info_load_icon (info, NULL);
-
   g_free (content_type);
   g_object_unref (icon);
+
+  if (!info)
+    return NULL;
+
+  pixbuf = gtk_icon_info_load_icon (info, NULL);
   gtk_icon_info_free (info);
 
   return pixbuf;