nautilus r14615 - in trunk: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Fri Sep 12 09:22:25 2008
New Revision: 14615
URL: http://svn.gnome.org/viewvc/nautilus?rev=14615&view=rev

Log:
2008-09-12  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-directory.c
	(nautilus_directory_is_local):
	Always assume that directories in trash are local. Fixes #546353.
	Thanks to lvaro Vilanova Vidal.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-directory.c

Modified: trunk/libnautilus-private/nautilus-directory.c
==============================================================================
--- trunk/libnautilus-private/nautilus-directory.c	(original)
+++ trunk/libnautilus-private/nautilus-directory.c	Fri Sep 12 09:22:25 2008
@@ -571,7 +571,9 @@
 	if (directory->details->location == NULL) {
 		return TRUE;
 	}
-	return g_file_is_native (directory->details->location);
+
+	return nautilus_directory_is_in_trash (directory) ||
+	       g_file_is_native (directory->details->location);
 }
 
 gboolean