From 18e73eb35c914f32a96d6753274c64101a77d326 Mon Sep 17 00:00:00 2001
From: Daniel Mueller <daniel.mueller@karlstorz.com>
Date: Mon, 9 Nov 2015 17:40:44 +0100
Subject: [PATCH 3/3] Handle MountOptions property as path/options pairs.

---
 data/org.freedesktop.UDisks2.xml |  7 ++++---
 src/udiskslinuxfilesystem.c      | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
index bc77e8a..3ac418e 100644
--- a/data/org.freedesktop.UDisks2.xml
+++ b/data/org.freedesktop.UDisks2.xml
@@ -1511,10 +1511,11 @@
     <property name="MountPoints" type="aay" access="read"/>
 
     <!-- MountOptions:
-         An array of mount option strings corresponding to the mount
-         points. If the device is not mounted, this array is empty.
+         An array of mount path/options-pairs for each mount path where
+         the device is mounted. If the device is not mounted, this array
+         is empty.
     -->
-    <property name="MountOptions" type="aay" access="read"/>
+    <property name="MountOptions" type="a(ayay)" access="read"/>
 
     <!--
         Mount:
diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index d9093f0..775f079 100644
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -145,7 +145,7 @@ udisks_linux_filesystem_update (UDisksLinuxFilesystem  *filesystem,
   UDisksMountMonitor *mount_monitor;
   UDisksLinuxDevice *device;
   GPtrArray *p;
-  GPtrArray *o;
+  GVariantBuilder options_builder;
   GList *mounts;
   GList *l;
 
@@ -153,7 +153,7 @@ udisks_linux_filesystem_update (UDisksLinuxFilesystem  *filesystem,
   device = udisks_linux_block_object_get_device (object);
 
   p = g_ptr_array_new ();
-  o = g_ptr_array_new ();
+  g_variant_builder_init (&options_builder, G_VARIANT_TYPE ("a(ayay)"));
   mounts = udisks_mount_monitor_get_mounts_for_dev (mount_monitor, g_udev_device_get_device_number (device->udev_device));
   /* we are guaranteed that the list is sorted so if there are
    * multiple mounts we'll always get the same order
@@ -164,17 +164,17 @@ udisks_linux_filesystem_update (UDisksLinuxFilesystem  *filesystem,
       if (udisks_mount_get_mount_type (mount) == UDISKS_MOUNT_TYPE_FILESYSTEM)
         {
           g_ptr_array_add (p, (gpointer) udisks_mount_get_mount_path (mount));
-          g_ptr_array_add (o, (gpointer) udisks_mount_get_mount_options (mount));
+          g_variant_builder_add (&options_builder, "(^ay^ay)",
+                                 (const gchar *const *) udisks_mount_get_mount_path (mount),
+                                 (const gchar *const *) udisks_mount_get_mount_options (mount));
         }
     }
   g_ptr_array_add (p, NULL);
-  g_ptr_array_add (o, NULL);
   udisks_filesystem_set_mount_points (UDISKS_FILESYSTEM (filesystem),
                                       (const gchar *const *) p->pdata);
   udisks_filesystem_set_mount_options (UDISKS_FILESYSTEM (filesystem),
-                                       (const gchar *const *) o->pdata);
+                                       g_variant_new ("a(ayay)", &options_builder));
   g_ptr_array_free (p, TRUE);
-  g_ptr_array_free (o, TRUE);
   g_list_foreach (mounts, (GFunc) g_object_unref, NULL);
   g_list_free (mounts);
   g_object_unref (device);
-- 
2.4.0