nautilus r15022 - in trunk: . src/file-manager

[alexl svn gnome org]

Author: alexl
Date: Thu Feb 26 07:35:49 2009
New Revision: 15022
URL: http://svn.gnome.org/viewvc/nautilus?rev=15022&view=rev

Log:
2009-02-26  Alexander Larsson  <alexl redhat com>

	* src/file-manager/fm-directory-view.c (add_submenu):
	Don't ref pixbuf if it is NULL



Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Thu Feb 26 07:35:49 2009
@@ -4212,9 +4212,11 @@
 						 escaped_label,
 						 NULL,
 						 NULL);
-			g_object_set_data_full (G_OBJECT (action), "menu-icon",
-						g_object_ref (pixbuf),
-						g_object_unref);
+			if (pixbuf != NULL) {
+				g_object_set_data_full (G_OBJECT (action), "menu-icon",
+							g_object_ref (pixbuf),
+							g_object_unref);
+			}
 			
 			g_object_set (action, "hide-if-empty", FALSE, NULL);