udisks2: Remove support for ID_SEAT=all

We might bring this back in one shape or the other, but remove it for
now until I get a chance to talk to Kay and Lennart some more.

Signed-off-by: David Zeuthen <davidz@redhat.com>

5 files changed, 5 insertions, 21 deletions

diff --git a/monitor/udisks2/gvfsudisks2utils.c b/monitor/udisks2/gvfsudisks2utils.c
index d747a635..19c6e284 100644
--- a/monitor/udisks2/gvfsudisks2utils.c
+++ b/monitor/udisks2/gvfsudisks2utils.c
@@ -547,11 +547,9 @@ get_seat (void)
 #endif
 
 gboolean
-gvfs_udisks2_utils_is_drive_on_our_seat (UDisksDrive *drive,
-                                         gboolean    *out_shared)
+gvfs_udisks2_utils_is_drive_on_our_seat (UDisksDrive *drive)
 {
   gboolean ret = FALSE;
-  gboolean shared = FALSE;
   const gchar *seat;
   const gchar *drive_seat = NULL;
 
@@ -582,20 +580,10 @@ gvfs_udisks2_utils_is_drive_on_our_seat (UDisksDrive *drive,
       goto out;
     }
 
-  /* "all" is special, it means the device is available on any seat */
-  if (g_strcmp0 (drive_seat, "all") == 0)
-    {
-      ret = TRUE;
-      shared = TRUE;
-      goto out;
-    }
-
   /* Otherwise, check if it's on our seat */
   if (g_strcmp0 (seat, drive_seat) == 0)
     ret = TRUE;
 
  out:
-  if (out_shared != NULL)
-    *out_shared = shared;
   return ret;
 }
diff --git a/monitor/udisks2/gvfsudisks2utils.h b/monitor/udisks2/gvfsudisks2utils.h
index 41ce8751..1965883a 100644
--- a/monitor/udisks2/gvfsudisks2utils.h
+++ b/monitor/udisks2/gvfsudisks2utils.h
@@ -50,8 +50,7 @@ gboolean gvfs_udisks2_utils_spawn_finish (GAsyncResult   *res,
                                           gchar         **out_standard_error,
                                           GError        **error);
 
-gboolean gvfs_udisks2_utils_is_drive_on_our_seat (UDisksDrive *drive,
-                                                  gboolean    *out_shared);
+gboolean gvfs_udisks2_utils_is_drive_on_our_seat (UDisksDrive *drive);
 
 
 G_END_DECLS
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
index bb5c6870..8b3ba988 100644
--- a/monitor/udisks2/gvfsudisks2volume.c
+++ b/monitor/udisks2/gvfsudisks2volume.c
@@ -273,7 +273,6 @@ update_volume (GVfsUDisks2Volume *volume)
           GIcon *drive_icon;
           gchar *media_desc;
           GIcon *media_icon;
-          gboolean shared;
 
           udisks_client_get_drive_info (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
                                         udisks_drive,
@@ -321,9 +320,8 @@ update_volume (GVfsUDisks2Volume *volume)
             g_object_unref (media_icon);
 
           /* Only automount drives attached to the same seat as we're running on
-           * and if the drive is NOT shared across all seats
            */
-          if (gvfs_udisks2_utils_is_drive_on_our_seat (udisks_drive, &shared) && !shared)
+          if (gvfs_udisks2_utils_is_drive_on_our_seat (udisks_drive))
             {
               /* Only automount filesystems from drives of known types/interconnects:
                *
diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c
index 002ab3c4..2826164e 100644
--- a/monitor/udisks2/gvfsudisks2volumemonitor.c
+++ b/monitor/udisks2/gvfsudisks2volumemonitor.c
@@ -906,7 +906,7 @@ should_include_drive (GVfsUDisks2VolumeMonitor *monitor,
   gboolean ret = TRUE;
 
   /* Don't include drives on other seats */
-  if (!gvfs_udisks2_utils_is_drive_on_our_seat (drive, NULL))
+  if (!gvfs_udisks2_utils_is_drive_on_our_seat (drive))
     {
       ret = FALSE;
       goto out;
diff --git a/monitor/udisks2/what-is-shown.txt b/monitor/udisks2/what-is-shown.txt
index 8fccb61f..8d0b0fe2 100644
--- a/monitor/udisks2/what-is-shown.txt
+++ b/monitor/udisks2/what-is-shown.txt
@@ -44,8 +44,7 @@ encryption options" paragraph in this blog entry
  http://davidz25.blogspot.com/2012/03/simpler-faster-better.html
 
 In a multi-seat system, only drives assigned to the seat the session
-is running on is shown. Automounting is turned off for drives attached
-to all seats.
+is running on is shown.
 
 EXAMPLES
 --------