[glib/wip/oholy/remote-attribute-fixes: 24/27] glocalfile: Fix G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE outside home
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/oholy/remote-attribute-fixes: 24/27] glocalfile: Fix G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE outside home
- Date: Thu, 18 Jun 2020 11:13:32 +0000 (UTC)
commit 706dc6b5aa8e57c8621d7017fdbcf35e0c059602
Author: Ondrej Holy <oholy redhat com>
Date: Mon Jun 15 17:14:30 2020 +0200
glocalfile: Fix G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE outside home
The G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE currently works only for locations
in the home directory. Let's make it work also for files outside the home
directory.
gio/glocalfile.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 1effea5fa..cc4d44898 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -112,6 +112,10 @@ G_DEFINE_TYPE_WITH_CODE (GLocalFile, g_local_file, G_TYPE_OBJECT,
static char *find_mountpoint_for (const char *file, dev_t dev, gboolean resolve_basename_symlink);
+#ifndef G_OS_WIN32
+static gboolean is_remote_fs (const gchar *filename);
+#endif
+
static void
g_local_file_finalize (GObject *object)
{
@@ -1111,11 +1115,13 @@ g_local_file_query_filesystem_info (GFile *file,
get_mount_info (info, local->filename, attribute_matcher);
#endif /* G_OS_WIN32 */
}
-
+
+#ifndef G_OS_WIN32
if (g_file_attribute_matcher_matches (attribute_matcher,
- G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE))
- g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE,
- g_local_file_is_remote (local->filename));
+ G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE))
+ g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE,
+ is_remote_fs (local->filename));
+#endif
g_file_attribute_matcher_unref (attribute_matcher);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]