Nautilus patch



This fixes an assertion failure that was introduced with Alex's trash
handling patch.

It makes sure that only one trash search operation happens per trash
volume.

Is this ok to put into 2.0.2?

-- 
Dave Camp <dave ximian com>
Index: libnautilus-private/nautilus-trash-directory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-trash-directory.c,v
retrieving revision 1.34
diff -u -r1.34 nautilus-trash-directory.c
--- libnautilus-private/nautilus-trash-directory.c	28 Aug 2002 16:09:19 -0000	1.34
+++ libnautilus-private/nautilus-trash-directory.c	4 Sep 2002 18:45:41 -0000
@@ -178,6 +178,12 @@
 		return;
 	}
 
+	if (trash_volume->handle) {
+		/* Already searching for trash */
+		gnome_vfs_uri_unref (volume_mount_uri);
+		return;
+	}
+
 	/* Find the real trash directory for this one. */
 	vfs_uri_as_list.data = volume_mount_uri;
 	vfs_uri_as_list.next = NULL;


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