diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-04-27 12:44:35 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-12-07 12:24:01 +0000 |
| commit | 95fa60f5d2c9c10f43c799296a9736ca25218912 (patch) | |
| tree | cb6d0f2b65e318b68cc3a472d42a35e2cf55fcb4 /monitor | |
| parent | 1fd0205fdec21717fa63f68710dc62d758f15721 (diff) | |
| download | gvfs-95fa60f5d2c9c10f43c799296a9736ca25218912.tar.gz | |
udisks2: Do not ignore mounts without volumes
gvfs_udisks2_mount_new returns NULL if volume is not specified and
mount is considered as internal by g_unix_mount_is_system_internal.
This prevents mount creation in certain cases even if x-gvfs-show is
manually specified. Mounts are already filtered out by
should_include_mounts, so I don't see much reason for additional check.
It is true that should_include_mount doesn't use
g_unix_mount_is_system_internal, but just
g_unix_is_mount_path_system_internal, however, we can change this
in future if needed.
https://gitlab.gnome.org/GNOME/gvfs/issues/330
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/udisks2/gvfsudisks2mount.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/monitor/udisks2/gvfsudisks2mount.c b/monitor/udisks2/gvfsudisks2mount.c index a4ce057c..73008e95 100644 --- a/monitor/udisks2/gvfsudisks2mount.c +++ b/monitor/udisks2/gvfsudisks2mount.c @@ -333,10 +333,6 @@ gvfs_udisks2_mount_new (GVfsUDisks2VolumeMonitor *monitor, { GVfsUDisks2Mount *mount = NULL; - /* Ignore internal mounts unless there's a volume */ - if (volume == NULL && (mount_entry != NULL && !g_unix_mount_guess_should_display (mount_entry))) - goto out; - mount = g_object_new (GVFS_TYPE_UDISKS2_MOUNT, NULL); mount->monitor = monitor; mount->sort_key = g_strdup_printf ("gvfs.time_detected_usec.%" G_GINT64_FORMAT, g_get_real_time ()); @@ -369,8 +365,6 @@ gvfs_udisks2_mount_new (GVfsUDisks2VolumeMonitor *monitor, update_mount (mount); - out: - return mount; } |