diff options
| -rw-r--r-- | src/nautilus-directory.c | 13 | ||||
| -rw-r--r-- | src/nautilus-directory.h | 2 | ||||
| -rw-r--r-- | src/nautilus-file.c | 13 | ||||
| -rw-r--r-- | src/nautilus-file.h | 2 | ||||
| -rw-r--r-- | src/nautilus-window-slot.c | 2 |
5 files changed, 5 insertions, 27 deletions
diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c index 89d3756b4..527b6bf93 100644 --- a/src/nautilus-directory.c +++ b/src/nautilus-directory.c @@ -775,19 +775,6 @@ nautilus_directory_new (GFile *location) * this directory. Otherwise, %FALSE. */ gboolean -nautilus_directory_is_local (NautilusDirectory *directory) -{ - g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE); - - if (directory->details->location == NULL) - { - return TRUE; - } - - return g_file_is_native (directory->details->location); -} - -gboolean nautilus_directory_is_local_or_fuse (NautilusDirectory *directory) { g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), FALSE); diff --git a/src/nautilus-directory.h b/src/nautilus-directory.h index 774514b1d..70317a30e 100644 --- a/src/nautilus-directory.h +++ b/src/nautilus-directory.h @@ -222,8 +222,6 @@ GList * nautilus_directory_match_pattern (NautilusDirector */ gboolean nautilus_directory_are_all_files_seen (NautilusDirectory *directory); -/* Return true if the directory is local. */ -gboolean nautilus_directory_is_local (NautilusDirectory *directory); gboolean nautilus_directory_is_local_or_fuse (NautilusDirectory *directory); gboolean nautilus_directory_is_in_trash (NautilusDirectory *directory); diff --git a/src/nautilus-file.c b/src/nautilus-file.c index 8e62d636a..124dc0287 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -2364,14 +2364,6 @@ nautilus_file_compare_location (NautilusFile *file_1, return (gint) res; } -gboolean -nautilus_file_is_local (NautilusFile *file) -{ - g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); - - return nautilus_directory_is_local (file->details->directory); -} - /** * nautilus_file_has_local_path: * @@ -6021,10 +6013,13 @@ nautilus_file_can_get_permissions (NautilusFile *file) gboolean nautilus_file_can_set_permissions (NautilusFile *file) { + g_autoptr (GFile) location = NULL; uid_t user_id; + location = nautilus_file_get_location (file); + if (file->details->uid != -1 && - nautilus_file_is_local (file)) + g_file_is_native (location)) { /* Check the user. */ user_id = geteuid (); diff --git a/src/nautilus-file.h b/src/nautilus-file.h index 604e7c61d..6946be5f8 100644 --- a/src/nautilus-file.h +++ b/src/nautilus-file.h @@ -421,8 +421,6 @@ char * nautilus_file_get_string_attribute_with_default_q (Nauti gboolean nautilus_file_matches_uri (NautilusFile *file, const char *uri); -/* Is the file local? */ -gboolean nautilus_file_is_local (NautilusFile *file); gboolean nautilus_file_has_local_path (NautilusFile *file); /* Comparing two file objects for sorting */ diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index c443d2c89..f27f7e2d1 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -1362,7 +1362,7 @@ check_force_reload (GFile *location, } else { - force_reload = !nautilus_directory_is_local (directory); + force_reload = !g_file_is_native (location); } /* We need to invalidate file attributes as well due to how mounting works |