From b60f861638f11117174d435860f2409963489995 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Fri, 12 Sep 2008 09:22:25 +0000 Subject: [PATCH] Always assume that directories in trash are local. Fixes #546353. Thanks 2008-09-12 Christian Neumair * libnautilus-private/nautilus-directory.c (nautilus_directory_is_local): Always assume that directories in trash are local. Fixes #546353. Thanks to lvaro Vilanova Vidal. svn path=/trunk/; revision=14615 --- ChangeLog | 7 +++++++ libnautilus-private/nautilus-directory.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dbf59bf1e..608b89aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-09-12 Christian Neumair + + * libnautilus-private/nautilus-directory.c + (nautilus_directory_is_local): + Always assume that directories in trash are local. Fixes #546353. + Thanks to lvaro Vilanova Vidal. + 2008-09-10 Christian Neumair * src/file-manager/fm-icon-container.c diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 4d15ba4f7..75ab6e1ce 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -571,7 +571,9 @@ nautilus_directory_is_local (NautilusDirectory *directory) 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 -- GitLab