Trash files are automatically assumed read-only, so we shouldn't add

2009-01-12  A. Walton  <awalton@gnome.org>

	* libnautilus-private/nautilus-file.c (prepend_automatic_keywords):
	Trash files are automatically assumed read-only, 
	so we shouldn't	add read-only emblems to files in the trash.

svn path=/trunk/; revision=14839

ChangeLog

+2009-01-12  A. Walton  <awalton@gnome.org>
+
+	* libnautilus-private/nautilus-file.c (prepend_automatic_keywords):
+	Trash files are automatically assumed read-only, 
+	so we shouldn't	add read-only emblems to files in the trash.
+
 2009-01-12  A. Walton  <awalton@gnome.org>
 
 	* libnautilus-private/nautilus-link.c

libnautilus-private/nautilus-file.c

@@ -2313,7 +2313,11 @@ prepend_automatic_keywords (NautilusFile *file,
 		names = g_list_prepend
 			(names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_NOTE));
 	}
+
+	/* Trash files are assumed to be read-only, 
+	 * so we want to ignore them here. */
 	if (!nautilus_file_can_write (file) &&
+	    !nautilus_file_is_in_trash (file) &&
 	    (parent == NULL || nautilus_file_can_write (parent))) {
 		names = g_list_prepend
 			(names, g_strdup (NAUTILUS_FILE_EMBLEM_NAME_CANT_WRITE));