[PATCH] Don't try to set NULL pixbuf as menu item icon



The attached patch fixes the case where we were poking around with NULL
pixbufs if the icon theme lookup failed.

-- 
Christian Neumair <chris gnome-de org>
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.708
diff -u -p -r1.708 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	6 Sep 2005 13:55:29 -0000	1.708
+++ src/file-manager/fm-directory-view.c	13 Sep 2005 22:42:54 -0000
@@ -6277,11 +6320,12 @@ connect_proxy (FMDirectoryView *view,
 						   "gnome-fs-regular",
 						   NAUTILUS_ICON_SIZE_FOR_MENUS,
 						   0, NULL);
+		if (pixbuf != NULL) {
+			image = gtk_image_new_from_pixbuf (pixbuf);
+			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
 
-		image = gtk_image_new_from_pixbuf (pixbuf);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
-
-		gdk_pixbuf_unref (pixbuf);
+			gdk_pixbuf_unref (pixbuf);
+		}
 	}
 }
 

Attachment: signature.asc
Description: This is a digitally signed message part



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]