summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2016-10-06 13:09:19 +0200
committerOndrej Holy <oholy@redhat.com>2016-10-10 14:41:21 +0200
commitb4e56f53c6ace35237e493d5319ebb7c20b28425 (patch)
treecb161b2f8df708f7ddd5efee8eeeb3d389de54c8
parent61626538c43164880cd0942dc41530497e1761f2 (diff)
downloadgvfs-b4e56f53c6ace35237e493d5319ebb7c20b28425.tar.gz
udisks2: Fix handling of volumes with multiple mountpoints
Volume is not included currently if it has multiple mount points and one of them is not considered as user interesting. Change this logic and include all volumes with at least one user interesting mount point. https://bugzilla.gnome.org/show_bug.cgi?id=772306
-rw-r--r--monitor/udisks2/gvfsudisks2volumemonitor.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c
index d7cf7122..708685b2 100644
--- a/monitor/udisks2/gvfsudisks2volumemonitor.c
+++ b/monitor/udisks2/gvfsudisks2volumemonitor.c
@@ -752,12 +752,14 @@ should_include_volume_check_mount_points (GVfsUDisks2VolumeMonitor *monitor,
mount_entry = g_unix_mount_at (mount_point, NULL);
if (mount_entry != NULL)
{
- if (!should_include_mount (monitor, mount_entry))
+ if (should_include_mount (monitor, mount_entry))
{
g_unix_mount_free (mount_entry);
- ret = FALSE;
+ ret = TRUE;
goto out;
}
+
+ ret = FALSE;
g_unix_mount_free (mount_entry);
}
}