From a1ffe7a85834c320a027c86d82fa206d06d5c0a1 Mon Sep 17 00:00:00 2001 From: "A. Walton" Date: Mon, 12 Jan 2009 20:03:41 +0000 Subject: [PATCH] Trash files are automatically assumed read-only, so we shouldn't add 2009-01-12 A. Walton * 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 | 6 ++++++ libnautilus-private/nautilus-file.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8b111f112..c2ea356ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-12 A. Walton + + * 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 * libnautilus-private/nautilus-link.c diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index d369e280b..7b850a54e 100644 --- a/libnautilus-private/nautilus-file.c +++ b/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)); -- GitLab