gedit r6380 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Sun Aug 10 17:39:44 2008
New Revision: 6380
URL: http://svn.gnome.org/viewvc/gedit?rev=6380&view=rev

Log:
2008-08-10  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-tab.c (get_icon): handle gracefully a failure
	in query_info().



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-tab.c

Modified: trunk/gedit/gedit-tab.c
==============================================================================
--- trunk/gedit/gedit-tab.c	(original)
+++ trunk/gedit/gedit-tab.c	Sun Aug 10 17:39:44 2008
@@ -1798,8 +1798,8 @@
 	GtkIconInfo *icon_info;
 	GFileInfo *info;
 	GIcon *gicon;
-	
-	if (!location)
+
+	if (location == NULL)
 		return get_stock_icon (theme, GTK_STOCK_FILE, size);
 
 	/* FIXME: Doing a sync stat is bad, this should be fixed */
@@ -1808,7 +1808,9 @@
 	                          G_FILE_QUERY_INFO_NONE, 
 	                          NULL, 
 	                          NULL);
-	
+	if (info == NULL)
+		return get_stock_icon (theme, GTK_STOCK_FILE, size);
+
 	gicon = g_file_info_get_icon (info);
 
 	if (gicon == NULL)
@@ -1820,13 +1822,13 @@
 	icon_info = gtk_icon_theme_lookup_by_gicon (theme, gicon, size, 0);
 	g_object_unref (info);	
 	
-	if (!icon_info)
+	if (icon_info == NULL)
 		return get_stock_icon (theme, GTK_STOCK_FILE, size);
 	
 	pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
 	gtk_icon_info_free (icon_info);
 	
-	if (!pixbuf)
+	if (pixbuf == NULL)
 		return get_stock_icon (theme, GTK_STOCK_FILE, size);
 		
 	return resize_icon (pixbuf, size);