nautilus r14839 - in trunk: . libnautilus-private

[awalton svn gnome org]

Author: awalton
Date: Mon Jan 12 20:03:41 2009
New Revision: 14839
URL: http://svn.gnome.org/viewvc/nautilus?rev=14839&view=rev

Log:
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.


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

Modified: trunk/libnautilus-private/nautilus-file.c
==============================================================================
--- trunk/libnautilus-private/nautilus-file.c	(original)
+++ trunk/libnautilus-private/nautilus-file.c	Mon Jan 12 20:03:41 2009
@@ -2313,7 +2313,11 @@
 		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));