[nautilus/wip/antoniof/local_vs_native_fixup: 85/90] directory: Revert bfd0b4bf02187b4da6ce0eb7c9a36df5d96ca649
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/local_vs_native_fixup: 85/90] directory: Revert bfd0b4bf02187b4da6ce0eb7c9a36df5d96ca649
- Date: Mon, 25 Jan 2021 10:54:14 +0000 (UTC)
commit 8bc93539cb3899b7fed08370c32cc802f5b59c7b
Author: António Fernandes <antoniof gnome org>
Date: Sat May 16 14:51:19 2020 +0100
directory: Revert bfd0b4bf02187b4da6ce0eb7c9a36df5d96ca649
That commit mixed the concepts of "file with local path", "local file",
and "native file". They are 3 different things, as documented in GIO.
Now, after the previous commits, the is_local() methods are no longer
employed to check that files have local paths. Instead, we now use
nautilus_file_is_local_or_fuse(), which was introduced[1] in order to
fix[2] for a regression caused by the commit we are now reverting.
[1] 2f1765d80392c06166d077c27a9a6661edd7c128
[2] 4df06e7f14ffefedc65bae84fca1cd7f5e945f78
src/nautilus-directory.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c
index 392a67fbc..499042e02 100644
--- a/src/nautilus-directory.c
+++ b/src/nautilus-directory.c
@@ -771,8 +771,7 @@ nautilus_directory_is_local (NautilusDirectory *directory)
return TRUE;
}
- return nautilus_directory_is_in_recent (directory) ||
- g_file_is_native (directory->details->location);
+ return g_file_is_native (directory->details->location);
}
gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]