Merge lp:~bcurtiswx/ubuntu/quantal/gvfs/1.13.3-0ubuntu1 into lp:ubuntu/quantal/gvfs

[Brian Curtis]

gvfs (1.13.3-0ubuntu1) UNRELEASED; urgency=low

  * New upstream release (LP #1025542).
  * debian/patches debian/patches/series
    - removed 00git_compile_error.patch as it's in upstream
    - refreshed patches
  * debian/control
    - bumped libglib2.0-dev dep to 2.33.4
    - added dep on libgtk-3-dev

 -- Brian Curtis <email address hidden> Fri, 20 Jul 2012 12:29:15 -0400

[Sebastien Bacher (seb128)]

Thanks for your work, you need to update the .install to list the new gvfsd-recent and recent.mount files, they should probably go to gvfs-backends

[lp:~bcurtiswx/ubuntu/quantal/gvfs/1.13.3-0ubuntu1]

195. By Brian Curtis on 2012-07-22

* debian/empathy-common.install
  - added man pages install

196. By Brian Curtis on 2012-07-23

* debian/gvfs-common.install
  - added usr/share/man/man1/
* debian/gvfs-backends
  - added usr/lib/gvfs/gvfsd-recent
  - added usr/share/gvfs/mounts/recent.mount

=== removed directory '.pc'
=== removed file '.pc/.quilt_patches'
--- .pc/.quilt_patches	2012-04-02 14:18:16 +0000
+++ .pc/.quilt_patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/patches

=== removed file '.pc/.quilt_series'
--- .pc/.quilt_series	2012-04-02 14:18:16 +0000
+++ .pc/.quilt_series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-series

=== removed file '.pc/.version'
--- .pc/.version	2011-04-13 17:17:02 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed directory '.pc/00git_compile_error.patch'
=== removed directory '.pc/00git_compile_error.patch/monitor'
=== removed directory '.pc/00git_compile_error.patch/monitor/udisks2'
=== removed file '.pc/00git_compile_error.patch/monitor/udisks2/gvfsudisks2mount.c'
--- .pc/00git_compile_error.patch/monitor/udisks2/gvfsudisks2mount.c	2012-06-06 13:48:26 +0000
+++ .pc/00git_compile_error.patch/monitor/udisks2/gvfsudisks2mount.c	1970-01-01 00:00:00 +0000
@@ -1,1303 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* gvfs - extensions for gio
- *
- * Copyright (C) 2006-2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <[e-mail]>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gio/gio.h>
-
-#include <gvfsmountinfo.h>
-
-#include <gudev/gudev.h>
-
-#include "gvfsudisks2volumemonitor.h"
-#include "gvfsudisks2mount.h"
-#include "gvfsudisks2volume.h"
-#include "gvfsudisks2drive.h"
-#include "gvfsudisks2utils.h"
-
-#define BUSY_UNMOUNT_NUM_ATTEMPTS              5
-#define BUSY_UNMOUNT_MS_DELAY_BETWEEN_ATTEMPTS 100
-
-typedef struct _GVfsUDisks2MountClass GVfsUDisks2MountClass;
-struct _GVfsUDisks2MountClass
-{
-  GObjectClass parent_class;
-};
-
-struct _GVfsUDisks2Mount
-{
-  GObject parent;
-
-  GVfsUDisks2VolumeMonitor *monitor; /* owned by volume monitor */
-
-  /* may be NULL */
-  GVfsUDisks2Volume        *volume;  /* owned by volume monitor */
-
-  /* may be NULL */
-  GUnixMountEntry *mount_entry;
-
-  /* the following members are set in update_mount() */
-  GFile *root;
-  GIcon *icon;
-  gchar *name;
-  gchar *sort_key;
-  gchar *uuid;
-  gchar *device_file;
-  gchar *mount_path;
-  gboolean can_unmount;
-  gchar *mount_entry_name;
-  gchar *mount_entry_fs_type;
-
-  gboolean is_burn_mount;
-
-  GIcon *autorun_icon;
-  gboolean searched_for_autorun;
-
-  gchar *xdg_volume_info_name;
-  GIcon *xdg_volume_info_icon;
-  gboolean searched_for_xdg_volume_info;
-
-  gchar *bdmv_volume_info_name;
-  GIcon *bdmv_volume_info_icon;
-  gboolean searched_for_bdmv_volume_info;
-};
-
-static gboolean update_mount (GVfsUDisks2Mount *mount);
-
-static void gvfs_udisks2_mount_mount_iface_init (GMountIface *iface);
-
-G_DEFINE_TYPE_EXTENDED (GVfsUDisks2Mount, gvfs_udisks2_mount, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_MOUNT,
-                                               gvfs_udisks2_mount_mount_iface_init))
-
-static void on_volume_changed (GVolume *volume, gpointer user_data);
-
-static void
-gvfs_udisks2_mount_finalize (GObject *object)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (object);
-
-  if (mount->volume != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (mount->volume, on_volume_changed, mount);
-      gvfs_udisks2_volume_unset_mount (mount->volume, mount);
-    }
-
-  if (mount->root != NULL)
-    g_object_unref (mount->root);
-  if (mount->icon != NULL)
-    g_object_unref (mount->icon);
-  g_free (mount->name);
-  g_free (mount->sort_key);
-  g_free (mount->uuid);
-  g_free (mount->device_file);
-  g_free (mount->mount_path);
-
-  g_free (mount->mount_entry_name);
-
-  if (mount->autorun_icon != NULL)
-    g_object_unref (mount->autorun_icon);
-
-  g_free (mount->xdg_volume_info_name);
-  if (mount->xdg_volume_info_icon != NULL)
-    g_object_unref (mount->xdg_volume_info_icon);
-
-  G_OBJECT_CLASS (gvfs_udisks2_mount_parent_class)->finalize (object);
-}
-
-static void
-gvfs_udisks2_mount_class_init (GVfsUDisks2MountClass *klass)
-{
-  GObjectClass *gobject_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = gvfs_udisks2_mount_finalize;
-}
-
-static void
-gvfs_udisks2_mount_init (GVfsUDisks2Mount *mount)
-{
-}
-
-static void
-emit_changed (GVfsUDisks2Mount *mount)
-{
-  g_signal_emit_by_name (mount, "changed");
-  g_signal_emit_by_name (mount->monitor, "mount-changed", mount);
-}
-
-static void
-got_autorun_info_cb (GObject      *source_object,
-                     GAsyncResult *res,
-                     gpointer      user_data)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (user_data);
-  mount->autorun_icon = g_vfs_mount_info_query_autorun_info_finish (G_FILE (source_object), res, NULL);
-  if (update_mount (mount))
-    emit_changed (mount);
-  g_object_unref (mount);
-}
-
-static void
-got_xdg_volume_info_cb (GObject      *source_object,
-                        GAsyncResult *res,
-                        gpointer      user_data)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (user_data);
-  mount->xdg_volume_info_icon = g_vfs_mount_info_query_xdg_volume_info_finish (G_FILE (source_object),
-                                                                               res,
-                                                                               &(mount->xdg_volume_info_name),
-                                                                               NULL);
-  if (update_mount (mount))
-    emit_changed (mount);
-  g_object_unref (mount);
-}
-
-static void
-got_bdmv_volume_info_cb (GObject      *source_object,
-                         GAsyncResult *res,
-                         gpointer      user_data)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (user_data);
-  mount->bdmv_volume_info_icon = g_vfs_mount_info_query_bdmv_volume_info_finish (G_FILE (source_object),
-                                                                                 res,
-                                                                                 &(mount->bdmv_volume_info_name),
-                                                                                 NULL);
-  if (update_mount (mount))
-    emit_changed (mount);
-  g_object_unref (mount);
-}
-
-static gboolean
-update_mount (GVfsUDisks2Mount *mount)
-{
-  gboolean changed;
-  gboolean old_can_unmount;
-  gchar *old_name;
-  GIcon *old_icon;
-
-  /* save old values */
-  old_can_unmount = mount->can_unmount;
-  old_name = g_strdup (mount->name);
-  old_icon = mount->icon != NULL ? g_object_ref (mount->icon) : NULL;
-
-  /* reset */
-  mount->can_unmount = FALSE;
-  g_clear_object (&mount->icon);
-  g_free (mount->name); mount->name = NULL;
-
-  /* in with the new */
-  if (mount->volume != NULL)
-    {
-      mount->can_unmount = TRUE;
-
-      /* icon order of preference: bdmv, xdg, autorun, probed */
-      if (mount->bdmv_volume_info_icon != NULL)
-        mount->icon = g_object_ref (mount->bdmv_volume_info_icon);
-      else if (mount->xdg_volume_info_icon != NULL)
-        mount->icon = g_object_ref (mount->xdg_volume_info_icon);
-      else if (mount->autorun_icon != NULL)
-        mount->icon = g_object_ref (mount->autorun_icon);
-      else
-        mount->icon = g_volume_get_icon (G_VOLUME (mount->volume));
-
-      /* name order of preference : bdmv, xdg, probed */
-      if (mount->bdmv_volume_info_name != NULL)
-        mount->name = g_strdup (mount->bdmv_volume_info_name);
-      else if (mount->xdg_volume_info_name != NULL)
-        mount->name = g_strdup (mount->xdg_volume_info_name);
-      else
-        mount->name = g_volume_get_name (G_VOLUME (mount->volume));
-    }
-  else
-    {
-      mount->can_unmount = TRUE;
-
-      if (mount->icon != NULL)
-        g_object_unref (mount->icon);
-
-      /* icon order of preference: bdmv, xdg, autorun, probed */
-      if (mount->bdmv_volume_info_icon != NULL)
-        mount->icon = g_object_ref (mount->bdmv_volume_info_icon);
-      else if (mount->xdg_volume_info_icon != NULL)
-        mount->icon = g_object_ref (mount->xdg_volume_info_icon);
-      else if (mount->autorun_icon != NULL)
-        mount->icon = g_object_ref (mount->autorun_icon);
-      else
-        {
-          mount->icon = gvfs_udisks2_utils_icon_from_fs_type (g_unix_mount_get_fs_type (mount->mount_entry));
-        }
-
-      g_free (mount->name);
-
-      /* name order of preference: bdmv, xdg, probed */
-      if (mount->bdmv_volume_info_name != NULL)
-        mount->name = g_strdup (mount->bdmv_volume_info_name);
-      else if (mount->xdg_volume_info_name != NULL)
-        mount->name = g_strdup (mount->xdg_volume_info_name);
-      else
-        mount->name = g_strdup (mount->mount_entry_name);
-    }
-
-  /* compute whether something changed */
-  changed = !((old_can_unmount == mount->can_unmount) &&
-              (g_strcmp0 (old_name, mount->name) == 0) &&
-              g_icon_equal (old_icon, mount->icon));
-
-  /* free old values */
-  g_free (old_name);
-  if (old_icon != NULL)
-    g_object_unref (old_icon);
-
-  /*g_debug ("in update_mount(), changed=%d", changed);*/
-
-  /* search for BDMV */
-  if (!mount->searched_for_bdmv_volume_info)
-    {
-      mount->searched_for_bdmv_volume_info = TRUE;
-      g_vfs_mount_info_query_bdmv_volume_info (mount->root,
-      					       NULL,
-      					       got_bdmv_volume_info_cb,
-      					       g_object_ref (mount));
-    }
-
-  /* search for .xdg-volume-info */
-  if (!mount->searched_for_xdg_volume_info)
-    {
-      mount->searched_for_xdg_volume_info = TRUE;
-      g_vfs_mount_info_query_xdg_volume_info (mount->root,
-                                              NULL,
-                                              got_xdg_volume_info_cb,
-                                              g_object_ref (mount));
-    }
-
-  /* search for autorun.inf */
-  if (!mount->searched_for_autorun)
-    {
-      mount->searched_for_autorun = TRUE;
-      g_vfs_mount_info_query_autorun_info (mount->root,
-                                           NULL,
-                                           got_autorun_info_cb,
-                                           g_object_ref (mount));
-    }
-
-  return changed;
-}
-
-static void
-on_volume_changed (GVolume  *volume,
-                   gpointer  user_data)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (user_data);
-  if (update_mount (mount))
-    emit_changed (mount);
-}
-
-GVfsUDisks2Mount *
-gvfs_udisks2_mount_new (GVfsUDisks2VolumeMonitor *monitor,
-                        GUnixMountEntry          *mount_entry, /* takes ownership */
-                        GVfsUDisks2Volume        *volume)
-{
-  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 ());
-
-  if (mount_entry != NULL)
-    {
-      mount->mount_entry = mount_entry; /* takes ownership */
-      mount->mount_entry_name = g_unix_mount_guess_name (mount_entry);
-      mount->device_file = g_strdup (g_unix_mount_get_device_path (mount_entry));
-      mount->mount_path = g_strdup (g_unix_mount_get_mount_path (mount_entry));
-      mount->root = g_file_new_for_path (mount->mount_path);
-    }
-  else
-    {
-      /* burn:/// mount (the only mounts we support with mount_entry == NULL) */
-      mount->device_file = NULL;
-      mount->mount_path = NULL;
-      mount->root = g_file_new_for_uri ("burn:///");
-      mount->is_burn_mount = TRUE;
-    }
-
-  /* need to set the volume only when the mount is fully constructed */
-  mount->volume = volume;
-  if (mount->volume != NULL)
-    {
-      gvfs_udisks2_volume_set_mount (volume, mount);
-      /* this is for piggy backing on the name and icon of the associated volume */
-      g_signal_connect (mount->volume, "changed", G_CALLBACK (on_volume_changed), mount);
-    }
-
-  update_mount (mount);
-
- out:
-
-  return mount;
-}
-
-void
-gvfs_udisks2_mount_unmounted (GVfsUDisks2Mount *mount)
-{
-  if (mount->volume != NULL)
-    {
-      gvfs_udisks2_volume_unset_mount (mount->volume, mount);
-      g_signal_handlers_disconnect_by_func (mount->volume, on_volume_changed, mount);
-      mount->volume = NULL;
-      emit_changed (mount);
-    }
-}
-
-void
-gvfs_udisks2_mount_unset_volume (GVfsUDisks2Mount   *mount,
-                                 GVfsUDisks2Volume  *volume)
-{
-  if (mount->volume == volume)
-    {
-      g_signal_handlers_disconnect_by_func (mount->volume, on_volume_changed, mount);
-      mount->volume = NULL;
-      emit_changed (mount);
-    }
-}
-
-void
-gvfs_udisks2_mount_set_volume (GVfsUDisks2Mount   *mount,
-                               GVfsUDisks2Volume  *volume)
-{
-  if (mount->volume != volume)
-    {
-      if (mount->volume != NULL)
-        gvfs_udisks2_mount_unset_volume (mount, mount->volume);
-      mount->volume = volume;
-      if (mount->volume != NULL)
-        {
-          gvfs_udisks2_volume_set_mount (volume, mount);
-          /* this is for piggy backing on the name and icon of the associated volume */
-          g_signal_connect (mount->volume, "changed", G_CALLBACK (on_volume_changed), mount);
-        }
-      update_mount (mount);
-      emit_changed (mount);
-    }
-}
-
-static GFile *
-gvfs_udisks2_mount_get_root (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return mount->root != NULL ? g_object_ref (mount->root) : NULL;
-}
-
-static GIcon *
-gvfs_udisks2_mount_get_icon (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return mount->icon != NULL ? g_object_ref (mount->icon) : NULL;
-}
-
-static gchar *
-gvfs_udisks2_mount_get_uuid (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return g_strdup (mount->uuid);
-}
-
-static gchar *
-gvfs_udisks2_mount_get_name (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return g_strdup (mount->name);
-}
-
-gboolean
-gvfs_udisks2_mount_has_uuid (GVfsUDisks2Mount *_mount,
-                             const gchar      *uuid)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return g_strcmp0 (mount->uuid, uuid) == 0;
-}
-
-const gchar *
-gvfs_udisks2_mount_get_mount_path (GVfsUDisks2Mount *mount)
-{
-  return mount->mount_path;
-}
-
-GUnixMountEntry *
-gvfs_udisks2_mount_get_mount_entry (GVfsUDisks2Mount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return mount->mount_entry;
-}
-
-static GDrive *
-gvfs_udisks2_mount_get_drive (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  GDrive *drive = NULL;
-
-  if (mount->volume != NULL)
-    drive = g_volume_get_drive (G_VOLUME (mount->volume));
-  return drive;
-}
-
-static GVolume *
-gvfs_udisks2_mount_get_volume_ (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  GVolume *volume = NULL;
-
-  if (mount->volume != NULL)
-    volume = G_VOLUME (g_object_ref (mount->volume));
-  return volume;
-}
-
-static gboolean
-gvfs_udisks2_mount_can_unmount (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return mount->can_unmount;
-}
-
-static gboolean
-gvfs_udisks2_mount_can_eject (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  GDrive *drive;
-  gboolean can_eject;
-
-  can_eject = FALSE;
-  if (mount->volume != NULL)
-    {
-      drive = g_volume_get_drive (G_VOLUME (mount->volume));
-      if (drive != NULL)
-        can_eject = g_drive_can_eject (drive);
-    }
-
-  return can_eject;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-typedef struct
-{
-  volatile gint ref_count;
-  GSimpleAsyncResult *simple;
-  gboolean completed;
-
-  GVfsUDisks2Mount *mount;
-
-  UDisksEncrypted *encrypted;
-  UDisksFilesystem *filesystem;
-
-  GCancellable *cancellable;
-
-  GMountOperation *mount_operation;
-  GMountUnmountFlags flags;
-
-  gulong mount_op_reply_handler_id;
-  guint retry_unmount_timer_id;
-} UnmountData;
-
-static UnmountData *
-unmount_data_ref (UnmountData *data)
-{
-  g_atomic_int_inc (&data->ref_count);
-  return data;
-}
-
-static void
-unmount_data_unref (UnmountData *data)
-{
-  if (g_atomic_int_dec_and_test (&data->ref_count))
-    {
-      g_object_unref (data->simple);
-
-      if (data->mount_op_reply_handler_id > 0)
-        {
-          /* make the operation dialog go away */
-          g_signal_emit_by_name (data->mount_operation, "aborted");
-          g_signal_handler_disconnect (data->mount_operation, data->mount_op_reply_handler_id);
-        }
-      if (data->retry_unmount_timer_id > 0)
-        {
-          g_source_remove (data->retry_unmount_timer_id);
-          data->retry_unmount_timer_id = 0;
-        }
-
-      g_clear_object (&data->mount);
-      g_clear_object (&data->cancellable);
-      g_clear_object (&data->mount_operation);
-      g_clear_object (&data->encrypted);
-      g_clear_object (&data->filesystem);
-      g_free (data);
-    }
-}
-
-static void unmount_do (UnmountData *data, gboolean force);
-
-static gboolean
-on_retry_timer_cb (gpointer user_data)
-{
-  UnmountData *data = user_data;
-
-  if (data->retry_unmount_timer_id == 0)
-    goto out;
-
-  /* we're removing the timeout */
-  data->retry_unmount_timer_id = 0;
-
-  /* timeout expired => try again */
-  unmount_do (data, FALSE);
-
- out:
-  return FALSE; /* remove timeout */
-}
-
-static void
-on_mount_op_reply (GMountOperation       *mount_operation,
-                   GMountOperationResult result,
-                   gpointer              user_data)
-{
-  UnmountData *data = user_data;
-  gint choice;
-
-  /* disconnect the signal handler */
-  g_warn_if_fail (data->mount_op_reply_handler_id != 0);
-  g_signal_handler_disconnect (data->mount_operation,
-                               data->mount_op_reply_handler_id);
-  data->mount_op_reply_handler_id = 0;
-
-  choice = g_mount_operation_get_choice (mount_operation);
-
-  if (result == G_MOUNT_OPERATION_ABORTED ||
-      (result == G_MOUNT_OPERATION_HANDLED && choice == 1))
-    {
-      /* don't show an error dialog here */
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_FAILED_HANDLED,
-                                       "GMountOperation aborted (user should never see this "
-                                       "error since it is G_IO_ERROR_FAILED_HANDLED)");
-      g_simple_async_result_complete_in_idle (data->simple);
-      data->completed = TRUE;
-      unmount_data_unref (data);
-    }
-  else if (result == G_MOUNT_OPERATION_HANDLED)
-    {
-      /* user chose force unmount => try again with force_unmount==TRUE */
-      unmount_do (data, TRUE);
-    }
-  else
-    {
-      /* result == G_MOUNT_OPERATION_UNHANDLED => GMountOperation instance doesn't
-       * support :show-processes signal
-       */
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_BUSY,
-                                       _("One or more programs are preventing the unmount operation."));
-      g_simple_async_result_complete_in_idle (data->simple);
-      data->completed = TRUE;
-      unmount_data_unref (data);
-    }
-}
-
-static void
-lsof_command_cb (GObject       *source_object,
-                 GAsyncResult  *res,
-                 gpointer       user_data)
-{
-  UnmountData *data = user_data;
-  GError *error;
-  gint exit_status;
-  GArray *processes;
-  const gchar *choices[3] = {NULL, NULL, NULL};
-  const gchar *message;
-  gchar *standard_output = NULL;
-  const gchar *p;
-
-  processes = g_array_new (FALSE, FALSE, sizeof (GPid));
-
-  error = NULL;
-  if (!gvfs_udisks2_utils_spawn_finish (res,
-                                        &exit_status,
-                                        &standard_output,
-                                        NULL, /* gchar **out_standard_error */
-                                        &error))
-    {
-      g_printerr ("Error launching lsof(1): %s (%s, %d)\n",
-                  error->message, g_quark_to_string (error->domain), error->code);
-      g_error_free (error);
-      goto out;
-    }
-
-  if (!(WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0))
-    {
-      g_printerr ("lsof(1) did not exit normally\n");
-      goto out;
-    }
-
-  p = standard_output;
-  while (TRUE)
-    {
-      GPid pid;
-      gchar *endp;
-
-      if (*p == '\0')
-        break;
-
-      pid = strtol (p, &endp, 10);
-      if (pid == 0 && p == endp)
-        break;
-
-      g_array_append_val (processes, pid);
-
-      p = endp;
-    }
-
- out:
-  if (!data->completed)
-    {
-      gboolean is_eject;
-
-      is_eject = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (data->mount_operation), "x-udisks2-is-eject"));
-
-      /* We want to emit the 'show-processes' signal even if launching
-       * lsof(1) failed or if it didn't return any PIDs. This is because
-       * it won't show e.g. root-owned processes operating on files
-       * on the mount point.
-       *
-       * (unfortunately there's no way to convey that it failed)
-       */
-      if (data->mount_op_reply_handler_id == 0)
-        {
-          data->mount_op_reply_handler_id = g_signal_connect (data->mount_operation,
-                                                              "reply",
-                                                              G_CALLBACK (on_mount_op_reply),
-                                                              data);
-        }
-      if (is_eject)
-        {
-          choices[0] = _("Eject Anyway");
-        }
-      else
-        {
-          choices[0] = _("Unmount Anyway");
-        }
-      choices[1] = _("Cancel");
-      message = _("Volume is busy\n"
-                  "One or more applications are keeping the volume busy.");
-      g_signal_emit_by_name (data->mount_operation,
-                             "show-processes",
-                             message,
-                             processes,
-                             choices);
-      /* set up a timer to try unmounting every two seconds - this will also
-       * update the list of busy processes
-       */
-      if (data->retry_unmount_timer_id == 0)
-        {
-          data->retry_unmount_timer_id = g_timeout_add_seconds (2,
-                                                                on_retry_timer_cb,
-                                                                data);
-        }
-      g_array_free (processes, TRUE);
-      g_free (standard_output);
-    }
-  unmount_data_unref (data); /* return ref */
-}
-
-
-static void
-unmount_show_busy (UnmountData  *data,
-                   const gchar  *mount_point)
-{
-  gchar *escaped_mount_point;
-  escaped_mount_point = g_strescape (mount_point, NULL);
-  gvfs_udisks2_utils_spawn (10, /* timeout in seconds */
-                            data->cancellable,
-                            lsof_command_cb,
-                            unmount_data_ref (data),
-                            "lsof -t \"%s\"",
-                            escaped_mount_point);
-  g_free (escaped_mount_point);
-}
-
-static void
-lock_cb (GObject       *source_object,
-         GAsyncResult  *res,
-         gpointer       user_data)
-{
-  UDisksEncrypted *encrypted = UDISKS_ENCRYPTED (source_object);
-  UnmountData *data = user_data;
-  GError *error;
-
-  error = NULL;
-  if (!udisks_encrypted_call_lock_finish (encrypted,
-                                          res,
-                                          &error))
-    g_simple_async_result_take_error (data->simple, error);
-  g_simple_async_result_complete (data->simple);
-  data->completed = TRUE;
-  unmount_data_unref (data);
-}
-
-static void
-unmount_cb (GObject       *source_object,
-            GAsyncResult  *res,
-            gpointer       user_data)
-{
-  UDisksFilesystem *filesystem = UDISKS_FILESYSTEM (source_object);
-  UnmountData *data = user_data;
-  GError *error;
-
-  error = NULL;
-  if (!udisks_filesystem_call_unmount_finish (filesystem,
-                                              res,
-                                              &error))
-    {
-      gvfs_udisks2_utils_udisks_error_to_gio_error (error);
-
-      /* if the user passed in a GMountOperation, then do the GMountOperation::show-processes dance ... */
-      if (error->code == G_IO_ERROR_BUSY && data->mount_operation != NULL)
-        {
-          unmount_show_busy (data, udisks_filesystem_get_mount_points (filesystem)[0]);
-          goto out;
-        }
-      g_simple_async_result_take_error (data->simple, error);
-    }
-  else
-    {
-      gvfs_udisks2_volume_monitor_update (data->mount->monitor);
-      if (data->encrypted != NULL)
-        {
-          udisks_encrypted_call_lock (data->encrypted,
-                                      g_variant_new ("a{sv}", NULL), /* options */
-                                      data->cancellable,
-                                      lock_cb,
-                                      data);
-          goto out;
-        }
-    }
-
-  g_simple_async_result_complete (data->simple);
-  data->completed = TRUE;
-  unmount_data_unref (data);
- out:
-  ;
-}
-
-
-/* ------------------------------ */
-
-static void
-umount_command_cb (GObject       *source_object,
-                   GAsyncResult  *res,
-                   gpointer       user_data)
-{
-  UnmountData *data = user_data;
-  GError *error;
-  gint exit_status;
-  gchar *standard_error = NULL;
-
-  error = NULL;
-  if (!gvfs_udisks2_utils_spawn_finish (res,
-                                        &exit_status,
-                                        NULL, /* gchar **out_standard_output */
-                                        &standard_error,
-                                        &error))
-    {
-      g_simple_async_result_take_error (data->simple, error);
-      g_simple_async_result_complete (data->simple);
-      data->completed = TRUE;
-      unmount_data_unref (data);
-      goto out;
-    }
-
-  if (WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0)
-    {
-      gvfs_udisks2_volume_monitor_update (data->mount->monitor);
-      g_simple_async_result_complete (data->simple);
-      data->completed = TRUE;
-      unmount_data_unref (data);
-      goto out;
-    }
-
-  if (standard_error != NULL &&
-      (strstr (standard_error, "device is busy") != NULL ||
-       strstr (standard_error, "target is busy") != NULL))
-    {
-      unmount_show_busy (data, data->mount->mount_path);
-      goto out;
-    }
-
-  g_simple_async_result_set_error (data->simple,
-                                   G_IO_ERROR,
-                                   G_IO_ERROR_FAILED,
-                                   standard_error);
-  g_simple_async_result_complete (data->simple);
-  data->completed = TRUE;
-  unmount_data_unref (data);
-
- out:
-  g_free (standard_error);
-}
-
-static void
-unmount_do (UnmountData *data,
-            gboolean     force)
-{
-  GVariantBuilder builder;
-
-  /* Use the umount(8) command if there is no block device / filesystem */
-  if (data->filesystem == NULL)
-    {
-      gchar *escaped_mount_path;
-      escaped_mount_path = g_strescape (data->mount->mount_path, NULL);
-      gvfs_udisks2_utils_spawn (10, /* timeout in seconds */
-                                data->cancellable,
-                                umount_command_cb,
-                                data,
-                                "umount %s \"%s\"",
-                                force ? "-l " : "",
-                                escaped_mount_path);
-      g_free (escaped_mount_path);
-      goto out;
-    }
-
-  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
-  if (data->mount_operation == NULL)
-    {
-      g_variant_builder_add (&builder,
-                             "{sv}",
-                             "auth.no_user_interaction", g_variant_new_boolean (TRUE));
-    }
-  if (force || data->flags & G_MOUNT_UNMOUNT_FORCE)
-    {
-      g_variant_builder_add (&builder,
-                             "{sv}",
-                             "force", g_variant_new_boolean (TRUE));
-    }
-  g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (data->filesystem), G_MAXINT);
-  udisks_filesystem_call_unmount (data->filesystem,
-                                  g_variant_builder_end (&builder),
-                                  data->cancellable,
-                                  unmount_cb,
-                                  data);
-
- out:
-  ;
-}
-
-static void
-gvfs_udisks2_mount_unmount_with_operation (GMount              *_mount,
-                                           GMountUnmountFlags   flags,
-                                           GMountOperation     *mount_operation,
-                                           GCancellable        *cancellable,
-                                           GAsyncReadyCallback  callback,
-                                           gpointer             user_data)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  UnmountData *data;
-  UDisksBlock *block;
-
-  /* first emit the ::mount-pre-unmount signal */
-  g_signal_emit_by_name (mount->monitor, "mount-pre-unmount", mount);
-
-  data = g_new0 (UnmountData, 1);
-  data->ref_count = 1;
-  data->simple = g_simple_async_result_new (G_OBJECT (mount),
-                                            callback,
-                                            user_data,
-                                            gvfs_udisks2_mount_unmount_with_operation);
-  data->mount = g_object_ref (mount);
-  data->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL;
-  data->mount_operation = mount_operation != NULL ? g_object_ref (mount_operation) : NULL;
-  data->flags = flags;
-
-  if (mount->is_burn_mount)
-    {
-      /* burn mounts are really never mounted so complete successfully immediately */
-      g_simple_async_result_complete_in_idle (data->simple);
-      data->completed = TRUE;
-      unmount_data_unref (data);
-      goto out;
-    }
-
-  block = NULL;
-  if (mount->volume != NULL)
-    block = gvfs_udisks2_volume_get_block (data->mount->volume);
-  if (block != NULL)
-    {
-      GDBusObject *object;
-      object = g_dbus_interface_get_object (G_DBUS_INTERFACE (block));
-      if (object == NULL)
-        {
-          g_simple_async_result_set_error (data->simple,
-                                           G_IO_ERROR,
-                                           G_IO_ERROR_FAILED,
-                                           "No object for D-Bus interface");
-          g_simple_async_result_complete (data->simple);
-          data->completed = TRUE;
-          unmount_data_unref (data);
-          goto out;
-        }
-      data->filesystem = udisks_object_get_filesystem (UDISKS_OBJECT (object));
-      if (data->filesystem == NULL)
-        {
-          UDisksBlock *cleartext_block;
-
-          data->encrypted = udisks_object_get_encrypted (UDISKS_OBJECT (object));
-          if (data->encrypted == NULL)
-            {
-              g_simple_async_result_set_error (data->simple,
-                                               G_IO_ERROR,
-                                               G_IO_ERROR_FAILED,
-                                               "No filesystem or encrypted interface on D-Bus object");
-              g_simple_async_result_complete (data->simple);
-              data->completed = TRUE;
-              unmount_data_unref (data);
-              goto out;
-            }
-
-          cleartext_block = udisks_client_get_cleartext_block (gvfs_udisks2_volume_monitor_get_udisks_client (mount->monitor),
-                                                               block);
-          if (cleartext_block != NULL)
-            {
-              data->filesystem = udisks_object_get_filesystem (UDISKS_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (cleartext_block))));
-              g_object_unref (cleartext_block);
-              if (data->filesystem == NULL)
-                {
-                  g_simple_async_result_set_error (data->simple,
-                                                   G_IO_ERROR,
-                                                   G_IO_ERROR_FAILED,
-                                                   "No filesystem interface on D-Bus object for cleartext device");
-                  g_simple_async_result_complete (data->simple);
-                  data->completed = TRUE;
-                  unmount_data_unref (data);
-                  goto out;
-                }
-            }
-        }
-      g_assert (data->filesystem != NULL);
-    }
-  unmount_do (data, FALSE /* force */);
-
- out:
-  ;
-}
-
-static gboolean
-gvfs_udisks2_mount_unmount_with_operation_finish (GMount        *mount,
-                                                  GAsyncResult  *result,
-                                                  GError       **error)
-{
-  return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static void
-gvfs_udisks2_mount_unmount (GMount              *mount,
-                            GMountUnmountFlags   flags,
-                            GCancellable        *cancellable,
-                            GAsyncReadyCallback  callback,
-                            gpointer             user_data)
-{
-  gvfs_udisks2_mount_unmount_with_operation (mount, flags, NULL, cancellable, callback, user_data);
-}
-
-static gboolean
-gvfs_udisks2_mount_unmount_finish (GMount        *mount,
-                                   GAsyncResult  *result,
-                                   GError       **error)
-{
-  return gvfs_udisks2_mount_unmount_with_operation_finish (mount, result, error);
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-typedef struct
-{
-  GObject *object;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-} EjectWrapperOp;
-
-static void
-eject_wrapper_callback (GObject       *source_object,
-                        GAsyncResult  *res,
-                        gpointer       user_data)
-{
-  EjectWrapperOp *data  = user_data;
-  data->callback (data->object, res, data->user_data);
-  g_object_unref (data->object);
-  g_free (data);
-}
-
-static void
-gvfs_udisks2_mount_eject_with_operation (GMount              *_mount,
-                                         GMountUnmountFlags   flags,
-                                         GMountOperation     *mount_operation,
-                                         GCancellable        *cancellable,
-                                         GAsyncReadyCallback  callback,
-                                         gpointer             user_data)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  GDrive *drive;
-
-  drive = NULL;
-  if (mount->volume != NULL)
-    drive = g_volume_get_drive (G_VOLUME (mount->volume));
-
-  if (drive != NULL)
-    {
-      EjectWrapperOp *data;
-      data = g_new0 (EjectWrapperOp, 1);
-      data->object = g_object_ref (mount);
-      data->callback = callback;
-      data->user_data = user_data;
-      g_drive_eject_with_operation (drive, flags, mount_operation, cancellable, eject_wrapper_callback, data);
-      g_object_unref (drive);
-    }
-  else
-    {
-      GSimpleAsyncResult *simple;
-      simple = g_simple_async_result_new_error (G_OBJECT (mount),
-                                                callback,
-                                                user_data,
-                                                G_IO_ERROR,
-                                                G_IO_ERROR_FAILED,
-                                                _("Operation not supported by backend"));
-      g_simple_async_result_complete (simple);
-      g_object_unref (simple);
-    }
-}
-
-static gboolean
-gvfs_udisks2_mount_eject_with_operation_finish (GMount        *_mount,
-                                                GAsyncResult  *result,
-                                                GError       **error)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  gboolean ret = TRUE;
-  GDrive *drive;
-
-  drive = NULL;
-  if (mount->volume != NULL)
-    drive = g_volume_get_drive (G_VOLUME (mount->volume));
-
-  if (drive != NULL)
-    {
-      ret = g_drive_eject_with_operation_finish (drive, result, error);
-      g_object_unref (drive);
-    }
-  else
-    {
-      g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
-      ret = FALSE;
-    }
-  return ret;
-}
-
-static void
-gvfs_udisks2_mount_eject (GMount              *mount,
-                          GMountUnmountFlags   flags,
-                          GCancellable        *cancellable,
-                          GAsyncReadyCallback  callback,
-                          gpointer             user_data)
-{
-  gvfs_udisks2_mount_eject_with_operation (mount, flags, NULL, cancellable, callback, user_data);
-}
-
-static gboolean
-gvfs_udisks2_mount_eject_finish (GMount        *mount,
-                                 GAsyncResult  *result,
-                                 GError       **error)
-{
-  return gvfs_udisks2_mount_eject_with_operation_finish (mount, result, error);
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static gchar **
-gvfs_udisks2_mount_guess_content_type_sync (GMount        *_mount,
-                                            gboolean       force_rescan,
-                                            GCancellable  *cancellable,
-                                            GError       **error)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  gchar **x_content_types;
-  GPtrArray *p;
-  gchar **ret;
-  guint n;
-
-  p = g_ptr_array_new ();
-
-  /* doesn't make sense to probe blank discs - look at the disc type instead */
-  if (mount->is_burn_mount)
-    {
-      GDrive *drive;
-      drive = gvfs_udisks2_mount_get_drive (_mount);
-      if (drive != NULL)
-        {
-          UDisksDrive *udisks_drive = gvfs_udisks2_drive_get_udisks_drive (GVFS_UDISKS2_DRIVE (drive));;
-          const gchar *media = udisks_drive_get_media (udisks_drive);
-          if (media != NULL)
-            {
-              if (g_str_has_prefix (media, "optical_dvd"))
-                g_ptr_array_add (p, g_strdup ("x-content/blank-dvd"));
-              else if (g_str_has_prefix (media, "optical_hddvd"))
-                g_ptr_array_add (p, g_strdup ("x-content/blank-hddvd"));
-              else if (g_str_has_prefix (media, "optical_bd"))
-                g_ptr_array_add (p, g_strdup ("x-content/blank-bd"));
-              else
-                g_ptr_array_add (p, g_strdup ("x-content/blank-cd")); /* assume CD */
-            }
-          g_object_unref (drive);
-        }
-    }
-  else
-    {
-      /* sniff content type */
-      x_content_types = g_content_type_guess_for_tree (mount->root);
-      if (x_content_types != NULL)
-        {
-          for (n = 0; x_content_types[n] != NULL; n++)
-            g_ptr_array_add (p, g_strdup (x_content_types[n]));
-          g_strfreev (x_content_types);
-        }
-    }
-
-  /* Check if its bootable */
-  if (mount->device_file != NULL)
-    {
-      GUdevDevice *gudev_device;
-      gudev_device = g_udev_client_query_by_device_file (gvfs_udisks2_volume_monitor_get_gudev_client (mount->monitor),
-                                                         mount->device_file);
-      if (gudev_device != NULL)
-        {
-          if (g_udev_device_get_property_as_boolean (gudev_device, "OSINFO_BOOTABLE"))
-            g_ptr_array_add (p, g_strdup ("x-content/bootable-media"));
-          g_object_unref (gudev_device);
-        }
-    }
-
-  if (p->len == 0)
-    {
-      ret = NULL;
-      g_ptr_array_free (p, TRUE);
-    }
-  else
-    {
-      g_ptr_array_add (p, NULL);
-      ret = (char **) g_ptr_array_free (p, FALSE);
-    }
-  return ret;
-}
-
-/* since we're an out-of-process volume monitor we'll just do this sync */
-static void
-gvfs_udisks2_mount_guess_content_type (GMount              *mount,
-                                       gboolean             force_rescan,
-                                       GCancellable        *cancellable,
-                                       GAsyncReadyCallback  callback,
-                                       gpointer             user_data)
-{
-  GSimpleAsyncResult *simple;
-  simple = g_simple_async_result_new (G_OBJECT (mount),
-                                      callback,
-                                      user_data,
-                                      NULL);
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-}
-
-static gchar **
-gvfs_udisks2_mount_guess_content_type_finish (GMount        *mount,
-                                              GAsyncResult  *result,
-                                              GError       **error)
-{
-  return gvfs_udisks2_mount_guess_content_type_sync (mount, FALSE, NULL, error);
-}
-/* ---------------------------------------------------------------------------------------------------- */
-
-static const gchar *
-gvfs_udisks2_mount_get_sort_key (GMount *_mount)
-{
-  GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (_mount);
-  return mount->sort_key;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static void
-gvfs_udisks2_mount_mount_iface_init (GMountIface *iface)
-{
-  iface->get_root = gvfs_udisks2_mount_get_root;
-  iface->get_name = gvfs_udisks2_mount_get_name;
-  iface->get_icon = gvfs_udisks2_mount_get_icon;
-  iface->get_uuid = gvfs_udisks2_mount_get_uuid;
-  iface->get_drive = gvfs_udisks2_mount_get_drive;
-  iface->get_volume = gvfs_udisks2_mount_get_volume_;
-  iface->can_unmount = gvfs_udisks2_mount_can_unmount;
-  iface->can_eject = gvfs_udisks2_mount_can_eject;
-  iface->unmount = gvfs_udisks2_mount_unmount;
-  iface->unmount_finish = gvfs_udisks2_mount_unmount_finish;
-  iface->unmount_with_operation = gvfs_udisks2_mount_unmount_with_operation;
-  iface->unmount_with_operation_finish = gvfs_udisks2_mount_unmount_with_operation_finish;
-  iface->eject = gvfs_udisks2_mount_eject;
-  iface->eject_finish = gvfs_udisks2_mount_eject_finish;
-  iface->eject_with_operation = gvfs_udisks2_mount_eject_with_operation;
-  iface->eject_with_operation_finish = gvfs_udisks2_mount_eject_with_operation_finish;
-  iface->guess_content_type = gvfs_udisks2_mount_guess_content_type;
-  iface->guess_content_type_finish = gvfs_udisks2_mount_guess_content_type_finish;
-  iface->guess_content_type_sync = gvfs_udisks2_mount_guess_content_type_sync;
-  iface->get_sort_key = gvfs_udisks2_mount_get_sort_key;
-}
-
-gboolean
-gvfs_udisks2_mount_has_volume (GVfsUDisks2Mount   *mount,
-                               GVfsUDisks2Volume  *volume)
-{
-  return mount->volume == volume;
-}
-
-GVfsUDisks2Volume *
-gvfs_udisks2_mount_get_volume (GVfsUDisks2Mount *mount)
-{
-  return mount->volume;
-}

=== removed file '.pc/00git_compile_error.patch/monitor/udisks2/gvfsudisks2volume.c'
--- .pc/00git_compile_error.patch/monitor/udisks2/gvfsudisks2volume.c	2012-06-06 13:48:26 +0000
+++ .pc/00git_compile_error.patch/monitor/udisks2/gvfsudisks2volume.c	1970-01-01 00:00:00 +0000
@@ -1,1613 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* gvfs - extensions for gio
- *
- * Copyright (C) 2006-2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <[e-mail]>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gio/gio.h>
-
-#ifdef HAVE_KEYRING
-#include <gnome-keyring.h>
-#endif
-
-#include "gvfsudisks2drive.h"
-#include "gvfsudisks2volume.h"
-#include "gvfsudisks2mount.h"
-#include "gvfsudisks2utils.h"
-
-typedef struct _GVfsUDisks2VolumeClass GVfsUDisks2VolumeClass;
-
-struct _GVfsUDisks2VolumeClass
-{
-  GObjectClass parent_class;
-};
-
-struct MountData;
-typedef struct MountData MountData;
-
-static void mount_cancel_pending_op (MountData *data);
-
-struct _GVfsUDisks2Volume
-{
-  GObject parent;
-
-  GVfsUDisks2VolumeMonitor *monitor; /* owned by volume monitor */
-  GVfsUDisks2Mount         *mount;   /* owned by volume monitor */
-  GVfsUDisks2Drive         *drive;   /* owned by volume monitor */
-
-  /* If TRUE, the volume was discovered at coldplug time */
-  gboolean coldplug;
-
-  /* exactly one of these are set */
-  UDisksBlock *block;
-  GUnixMountPoint *mount_point;
-
-  /* set in update_volume() */
-  GIcon *icon;
-  GFile *activation_root;
-  gchar *name;
-  gchar *sort_key;
-  gchar *device_file;
-  dev_t dev;
-  gchar *uuid;
-  gboolean can_mount;
-  gboolean should_automount;
-
-  /* If a mount operation is in progress, then pending_mount_op is != NULL. This
-   * is used to cancel the operation to make possible authentication dialogs go
-   * away.
-   */
-  MountData *mount_pending_op;
-};
-
-static void gvfs_udisks2_volume_volume_iface_init (GVolumeIface *iface);
-
-static void on_block_changed (GObject    *object,
-                              GParamSpec *pspec,
-                              gpointer    user_data);
-
-static void on_udisks_client_changed (UDisksClient *client,
-                                      gpointer      user_data);
-
-G_DEFINE_TYPE_EXTENDED (GVfsUDisks2Volume, gvfs_udisks2_volume, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_VOLUME, gvfs_udisks2_volume_volume_iface_init))
-
-static void
-gvfs_udisks2_volume_finalize (GObject *object)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (object);
-
-  g_signal_handlers_disconnect_by_func (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                        G_CALLBACK (on_udisks_client_changed),
-                                        volume);
-
-  if (volume->mount != NULL)
-    {
-      gvfs_udisks2_mount_unset_volume (volume->mount, volume);
-    }
-
-  if (volume->drive != NULL)
-    {
-      gvfs_udisks2_drive_unset_volume (volume->drive, volume);
-    }
-
-  if (volume->block != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (volume->block, G_CALLBACK (on_block_changed), volume);
-      g_object_unref (volume->block);
-    }
-
-  if (volume->mount_point != NULL)
-    g_unix_mount_point_free (volume->mount_point);
-
-  if (volume->icon != NULL)
-    g_object_unref (volume->icon);
-  if (volume->activation_root != NULL)
-    g_object_unref (volume->activation_root);
-
-  g_free (volume->name);
-  g_free (volume->sort_key);
-  g_free (volume->device_file);
-  g_free (volume->uuid);
-
-  G_OBJECT_CLASS (gvfs_udisks2_volume_parent_class)->finalize (object);
-}
-
-static void
-gvfs_udisks2_volume_class_init (GVfsUDisks2VolumeClass *klass)
-{
-  GObjectClass *gobject_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = gvfs_udisks2_volume_finalize;
-}
-
-static void
-gvfs_udisks2_volume_init (GVfsUDisks2Volume *volume)
-{
-}
-
-static void
-emit_changed (GVfsUDisks2Volume *volume)
-{
-  g_signal_emit_by_name (volume, "changed");
-  g_signal_emit_by_name (volume->monitor, "volume-changed", volume);
-}
-
-static void
-apply_options_from_fstab (GVfsUDisks2Volume *volume,
-                          const gchar       *fstab_options)
-{
-  gchar *name;
-  gchar *icon_name;
-
-  name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "x-gvfs-name=");
-  if (name != NULL)
-    {
-      g_free (volume->name);
-      volume->name = name;
-    }
-
-  icon_name = gvfs_udisks2_utils_lookup_fstab_options_value (fstab_options, "x-gvfs-icon=");
-  if (icon_name != NULL)
-    {
-      volume->icon = g_themed_icon_new_with_default_fallbacks (icon_name);
-      g_free (icon_name);
-    }
-}
-
-static gboolean
-update_volume (GVfsUDisks2Volume *volume)
-{
-  gboolean changed;
-  gboolean old_can_mount;
-  gboolean old_should_automount;
-  gchar *old_name;
-  gchar *old_device_file;
-  dev_t old_dev;
-  GIcon *old_icon;
-  UDisksDrive *udisks_drive;
-  gchar *s;
-
-  /* ---------------------------------------------------------------------------------------------------- */
-  /* save old values */
-
-  old_can_mount = volume->can_mount;
-  old_should_automount = volume->should_automount;
-  old_name = g_strdup (volume->name);
-  old_device_file = g_strdup (volume->device_file);
-  old_dev = volume->dev;
-  old_icon = volume->icon != NULL ? g_object_ref (volume->icon) : NULL;
-
-  /* ---------------------------------------------------------------------------------------------------- */
-  /* reset */
-
-  volume->can_mount = volume->should_automount = FALSE;
-  g_free (volume->name); volume->name = NULL;
-  g_free (volume->device_file); volume->device_file = NULL;
-  volume->dev = 0;
-  g_clear_object (&volume->icon);
-
-  /* ---------------------------------------------------------------------------------------------------- */
-  /* in with the new */
-
-  if (volume->block != NULL)
-    {
-      const gchar *hint;
-      UDisksBlock *block;
-      UDisksBlock *cleartext_block;
-      GVariantIter iter;
-      const gchar *configuration_type;
-      GVariant *configuration_value;
-
-      /* If unlocked, use the values from the unlocked block device for presentation */
-      cleartext_block = udisks_client_get_cleartext_block (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                                           volume->block);
-      if (cleartext_block != NULL)
-        block = cleartext_block;
-      else
-        block = volume->block;
-
-      volume->dev = udisks_block_get_device_number (block);
-      volume->device_file = udisks_block_dup_device (block);
-
-      if (strlen (udisks_block_get_id_label (block)) > 0)
-        {
-          volume->name = g_strdup (udisks_block_get_id_label (block));
-        }
-      else if (g_strcmp0 (udisks_block_get_id_type (block), "crypto_LUKS") == 0)
-        {
-          s = udisks_client_get_size_for_display (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                                  udisks_block_get_size (volume->block), FALSE, FALSE);
-          /* Translators: This is used for encrypted volumes.
-           *              The first %s is the formatted size (e.g. "42.0 MB").
-           */
-          volume->name = g_strdup_printf (_("%s Encrypted"), s);
-          g_free (s);
-        }
-      else
-        {
-          guint64 size = udisks_block_get_size (block);
-          if (size > 0)
-            {
-              s = udisks_client_get_size_for_display (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                                      size, FALSE, FALSE);
-              /* Translators: This is used for volume with no filesystem label.
-               *              The first %s is the formatted size (e.g. "42.0 MB").
-               */
-              volume->name = g_strdup_printf (_("%s Volume"), s);
-              g_free (s);
-            }
-        }
-
-      udisks_drive = udisks_client_get_drive_for_block (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                                        volume->block);
-      if (udisks_drive != NULL)
-        {
-          gchar *drive_desc;
-          GIcon *drive_icon;
-          gchar *media_desc;
-          GIcon *media_icon;
-
-          udisks_client_get_drive_info (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                        udisks_drive,
-                                        NULL, /* drive_name */
-                                        &drive_desc,
-                                        &drive_icon,
-                                        &media_desc,
-                                        &media_icon);
-          if (media_desc == NULL)
-            {
-              media_desc = drive_desc;
-              drive_desc = NULL;
-            }
-          if (media_icon == NULL)
-            {
-              media_icon = drive_icon;
-              drive_icon = NULL;
-            }
-
-          /* Override name for blank and audio discs */
-          if (udisks_drive_get_optical_blank (udisks_drive))
-            {
-              g_free (volume->name);
-              volume->name = g_strdup (media_desc);
-            }
-          else if (volume->activation_root != NULL && g_file_has_uri_scheme (volume->activation_root, "cdda"))
-            {
-              g_free (volume->name);
-              volume->name = g_strdup (_("Audio Disc"));
-            }
-
-          volume->icon = media_icon != NULL ? g_object_ref (media_icon) : NULL;
-
-          /* use media_desc if we haven't figured out a name yet (applies to e.g.
-           * /dev/fd0 since its size is 0)
-           */
-          if (volume->name == NULL)
-            {
-              volume->name = media_desc;
-              media_desc = NULL;
-            }
-
-          g_free (media_desc);
-          if (media_icon != NULL)
-            g_object_unref (media_icon);
-
-          /* Only automount drives attached to the same seat as we're running on
-           */
-          if (gvfs_udisks2_utils_is_drive_on_our_seat (udisks_drive))
-            {
-              /* Only automount filesystems from drives of known types/interconnects:
-               *
-               *  - USB
-               *  - Firewire
-               *  - sdio
-               *  - optical discs
-               *
-               * The mantra here is "be careful" - we really don't want to
-               * automount filesystems from all devices in a SAN etc - We
-               * REALLY need to be CAREFUL here.
-               *
-               * Fortunately udisks provides a property just for this.
-               */
-              if (udisks_block_get_hint_auto (volume->block))
-                {
-                  gboolean just_plugged_in = FALSE;
-                  /* Also, if a volume (partition) appear _much later_ than when media was inserted it
-                   * can only be because the media was repartitioned. We don't want to automount
-                   * such volumes. So only mark volumes appearing just after their drive.
-                   *
-                   * There's a catch here - if the volume was discovered at coldplug-time (typically
-                   * when the user desktop session started), we can't use this heuristic
-                   */
-                  if (g_get_real_time () - udisks_drive_get_time_media_detected (udisks_drive) < 5 * G_USEC_PER_SEC)
-                    just_plugged_in = TRUE;
-                  if (volume->coldplug || just_plugged_in)
-                    volume->should_automount = TRUE;
-                }
-            }
-          g_object_unref (udisks_drive);
-        }
-
-      /* Use hints, if available */
-      hint = udisks_block_get_hint_name (volume->block);
-      if (hint != NULL && strlen (hint) > 0)
-        {
-          g_free (volume->name);
-          volume->name = g_strdup (hint);
-        }
-      hint = udisks_block_get_hint_icon_name (volume->block);
-      if (hint != NULL && strlen (hint) > 0)
-        {
-          g_clear_object (&volume->icon);
-          volume->icon = g_themed_icon_new_with_default_fallbacks (hint);
-        }
-
-      /* Use x-gvfs-name=The%20Name and x-gvfs-icon=foo-name, if available */
-      g_variant_iter_init (&iter, udisks_block_get_configuration (block));
-      while (g_variant_iter_next (&iter, "(&s@a{sv})", &configuration_type, &configuration_value))
-        {
-          if (g_strcmp0 (configuration_type, "fstab") == 0)
-            {
-              const gchar *fstab_options;
-              if (g_variant_lookup (configuration_value, "opts", "^&ay", &fstab_options))
-                apply_options_from_fstab (volume, fstab_options);
-            }
-          g_variant_unref (configuration_value);
-        }
-
-      /* Add an emblem, depending on whether the encrypted volume is locked or unlocked */
-      if (g_strcmp0 (udisks_block_get_id_type (volume->block), "crypto_LUKS") == 0 && volume->icon != NULL)
-        {
-          GEmblem *emblem;
-          GIcon *padlock;
-          GIcon *emblemed_icon;
-          if (cleartext_block != NULL)
-            padlock = g_themed_icon_new ("changes-allow");
-          else
-            padlock = g_themed_icon_new ("changes-prevent");
-          emblem = g_emblem_new_with_origin (padlock, G_EMBLEM_ORIGIN_DEVICE);
-          emblemed_icon = g_emblemed_icon_new (volume->icon, emblem);
-          g_object_unref (padlock);
-          g_object_unref (emblem);
-
-          g_object_unref (volume->icon);
-          volume->icon = emblemed_icon;
-        }
-
-      g_clear_object (&cleartext_block);
-    }
-  else
-    {
-      apply_options_from_fstab (volume, g_unix_mount_point_get_options (volume->mount_point));
-      if (volume->name == NULL)
-        volume->name = g_unix_mount_point_guess_name (volume->mount_point);
-      if (volume->icon == NULL)
-        volume->icon = gvfs_udisks2_utils_icon_from_fs_type (g_unix_mount_point_get_fs_type (volume->mount_point));
-    }
-
-  if (volume->mount == NULL)
-    volume->can_mount = TRUE;
-
-  /* ---------------------------------------------------------------------------------------------------- */
-  /* fallbacks */
-
-  if (volume->name == NULL)
-    {
-      /* Translators: Name used for volume */
-      volume->name = g_strdup (_("Volume"));
-    }
-  if (volume->icon == NULL)
-    volume->icon = g_themed_icon_new ("drive-removable-media");
-
-  /* ---------------------------------------------------------------------------------------------------- */
-  /* compute whether something changed */
-
-  changed = !((old_can_mount == volume->can_mount) &&
-              (old_should_automount == volume->should_automount) &&
-              (g_strcmp0 (old_name, volume->name) == 0) &&
-              (g_strcmp0 (old_device_file, volume->device_file) == 0) &&
-              (old_dev == volume->dev) &&
-              g_icon_equal (old_icon, volume->icon)
-              );
-
-  /* ---------------------------------------------------------------------------------------------------- */
-  /* free old values */
-
-  g_free (old_name);
-  g_free (old_device_file);
-  if (old_icon != NULL)
-    g_object_unref (old_icon);
-
-  return changed;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static void
-update_volume_on_event (GVfsUDisks2Volume *volume)
-{
-  if (update_volume (volume))
-    {
-      emit_changed (volume);
-      /* It could be that volume->dev changed (cryptotext volume morphing into a cleartext
-       * volume)... since this is used to associated mounts with volumes (see the loop over
-       * @unchanged in gvfsudisks2volumemonitor.c:update_mounts()) we need to over
-       * the volume monitor
-       */
-      gvfs_udisks2_volume_monitor_update (volume->monitor);
-    }
-}
-
-static void
-on_block_changed (GObject    *object,
-                  GParamSpec *pspec,
-                  gpointer    user_data)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (user_data);
-  update_volume_on_event (volume);
-}
-
-static void
-on_udisks_client_changed (UDisksClient *client,
-                          gpointer      user_data)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (user_data);
-  update_volume_on_event (volume);
-}
-
-/* takes ownership of @mount_point if not NULL */
-GVfsUDisks2Volume *
-gvfs_udisks2_volume_new (GVfsUDisks2VolumeMonitor   *monitor,
-                         UDisksBlock                *block,
-                         GUnixMountPoint            *mount_point,
-                         GVfsUDisks2Drive           *drive,
-                         GFile                      *activation_root,
-                         gboolean                    coldplug)
-{
-  GVfsUDisks2Volume *volume;
-
-  volume = g_object_new (GVFS_TYPE_UDISKS2_VOLUME, NULL);
-  volume->monitor = monitor;
-  volume->coldplug = coldplug;
-
-  volume->sort_key = g_strdup_printf ("gvfs.time_detected_usec.%" G_GINT64_FORMAT, g_get_real_time ());
-
-  if (block != NULL)
-    {
-      volume->block = g_object_ref (block);
-      g_signal_connect (volume->block, "notify", G_CALLBACK (on_block_changed), volume);
-    }
-  else if (mount_point != NULL)
-    {
-      volume->mount_point = mount_point;
-    }
-  else
-    {
-      g_assert_not_reached ();
-    }
-
-  volume->activation_root = activation_root != NULL ? g_object_ref (activation_root) : NULL;
-
-  volume->drive = drive;
-  if (drive != NULL)
-    gvfs_udisks2_drive_set_volume (drive, volume);
-
-  update_volume (volume);
-
-  /* For LUKS devices, we also need to listen for changes on any possible cleartext device */
-  if (volume->block != NULL && g_strcmp0 (udisks_block_get_id_type (volume->block), "crypto_LUKS") == 0)
-    {
-      g_signal_connect (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                        "changed",
-                        G_CALLBACK (on_udisks_client_changed),
-                        volume);
-    }
-
-  return volume;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void
-gvfs_udisks2_volume_removed (GVfsUDisks2Volume *volume)
-{
-  if (volume->mount_pending_op != NULL)
-    mount_cancel_pending_op (volume->mount_pending_op);
-
-  if (volume->mount != NULL)
-    {
-      gvfs_udisks2_mount_unset_volume (volume->mount, volume);
-      volume->mount = NULL;
-    }
-
-  if (volume->drive != NULL)
-    {
-      gvfs_udisks2_drive_unset_volume (volume->drive, volume);
-      volume->drive = NULL;
-    }
-}
-
-void
-gvfs_udisks2_volume_set_mount (GVfsUDisks2Volume *volume,
-                               GVfsUDisks2Mount  *mount)
-{
-  if (volume->mount != mount)
-    {
-      if (volume->mount != NULL)
-        gvfs_udisks2_mount_unset_volume (volume->mount, volume);
-
-      volume->mount = mount;
-
-      emit_changed (volume);
-    }
-}
-
-void
-gvfs_udisks2_volume_unset_mount (GVfsUDisks2Volume *volume,
-                                 GVfsUDisks2Mount  *mount)
-{
-  if (volume->mount == mount)
-    {
-      volume->mount = NULL;
-      emit_changed (volume);
-    }
-}
-
-void
-gvfs_udisks2_volume_set_drive (GVfsUDisks2Volume *volume,
-                               GVfsUDisks2Drive  *drive)
-{
-  if (volume->drive != drive)
-    {
-      if (volume->drive != NULL)
-        gvfs_udisks2_drive_unset_volume (volume->drive, volume);
-      volume->drive = drive;
-      emit_changed (volume);
-    }
-}
-
-void
-gvfs_udisks2_volume_unset_drive (GVfsUDisks2Volume *volume,
-                                 GVfsUDisks2Drive  *drive)
-{
-  if (volume->drive == drive)
-    {
-      volume->drive = NULL;
-      emit_changed (volume);
-    }
-}
-
-static GIcon *
-gvfs_udisks2_volume_get_icon (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return volume->icon != NULL ? g_object_ref (volume->icon) : NULL;
-}
-
-static char *
-gvfs_udisks2_volume_get_name (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return g_strdup (volume->name);
-}
-
-static char *
-gvfs_udisks2_volume_get_uuid (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return g_strdup (volume->uuid);
-}
-
-static gboolean
-gvfs_udisks2_volume_can_mount (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return volume->can_mount;
-}
-
-static gboolean
-gvfs_udisks2_volume_can_eject (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  gboolean can_eject = FALSE;
-
-  if (volume->drive != NULL)
-    can_eject = g_drive_can_eject (G_DRIVE (volume->drive));
-  return can_eject;
-}
-
-static gboolean
-gvfs_udisks2_volume_should_automount (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return volume->should_automount;
-}
-
-static GDrive *
-gvfs_udisks2_volume_get_drive (GVolume *volume)
-{
-  GVfsUDisks2Volume *gdu_volume = GVFS_UDISKS2_VOLUME (volume);
-  GDrive *drive = NULL;
-
-  if (gdu_volume->drive != NULL)
-    drive = g_object_ref (gdu_volume->drive);
-  return drive;
-}
-
-static GMount *
-gvfs_udisks2_volume_get_mount (GVolume *volume)
-{
-  GVfsUDisks2Volume *gdu_volume = GVFS_UDISKS2_VOLUME (volume);
-  GMount *mount = NULL;
-
-  if (gdu_volume->mount != NULL)
-    mount = g_object_ref (gdu_volume->mount);
-  return mount;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static gboolean
-gvfs_udisks2_volume_is_network_class (GVfsUDisks2Volume *volume)
-{
-  gboolean ret = FALSE;
-  if (volume->mount_point != NULL)
-    {
-      const gchar *fstype = g_unix_mount_point_get_fs_type (volume->mount_point);
-      if (g_strcmp0 (fstype, "nfs") == 0 ||
-          g_strcmp0 (fstype, "nfs4") == 0 ||
-          g_strcmp0 (fstype, "cifs") == 0 ||
-          g_strcmp0 (fstype, "smbfs") == 0 ||
-          g_strcmp0 (fstype, "ncpfs") == 0)
-        ret = TRUE;
-    }
-  return ret;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-/* can remove this once we depend on gio >= 2.31.19 */
-#ifndef G_VOLUME_IDENTIFIER_KIND_CLASS
-#define G_VOLUME_IDENTIFIER_KIND_CLASS "class"
-#endif
-
-static gchar *
-gvfs_udisks2_volume_get_identifier (GVolume      *_volume,
-                                    const gchar  *kind)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  const gchar *label;
-  const gchar *uuid;
-  gchar *ret = NULL;
-
-  if (volume->block != NULL)
-    {
-      label = udisks_block_get_id_label (volume->block);
-      uuid = udisks_block_get_id_uuid (volume->block);
-
-      if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
-        ret = g_strdup (volume->device_file);
-      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
-        ret = strlen (label) > 0 ? g_strdup (label) : NULL;
-      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
-        ret = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
-    }
-  if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_CLASS) == 0)
-    ret = g_strdup (gvfs_udisks2_volume_is_network_class (volume) ? "network" : "device");
-
-  return ret;
-}
-
-static gchar **
-gvfs_udisks2_volume_enumerate_identifiers (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  GPtrArray *p;
-
-  p = g_ptr_array_new ();
-  g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_CLASS));
-  if (volume->block != NULL)
-    {
-      const gchar *label;
-      const gchar *uuid;
-      label = udisks_block_get_id_label (volume->block);
-      uuid = udisks_block_get_id_uuid (volume->block);
-      g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
-      if (strlen (label) > 0)
-        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
-      if (strlen (uuid) > 0)
-        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
-    }
-  g_ptr_array_add (p, NULL);
-  return (gchar **) g_ptr_array_free (p, FALSE);
-}
-
-static GFile *
-gvfs_udisks2_volume_get_activation_root (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return volume->activation_root != NULL ? g_object_ref (volume->activation_root) : NULL;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-#ifdef HAVE_KEYRING
-static GnomeKeyringPasswordSchema luks_passphrase_schema =
-{
-  GNOME_KEYRING_ITEM_GENERIC_SECRET,
-  {
-    {"gvfs-luks-uuid", GNOME_KEYRING_ATTRIBUTE_TYPE_STRING},
-    {NULL, 0}
-  }
-};
-#endif
-
-struct MountData
-{
-  GSimpleAsyncResult *simple;
-
-  GVfsUDisks2Volume *volume;
-  GCancellable *cancellable;
-
-  gulong mount_operation_reply_handler_id;
-  gulong mount_operation_aborted_handler_id;
-  GMountOperation *mount_operation;
-
-  gchar *passphrase;
-
-  gchar *passphrase_from_keyring;
-  GPasswordSave password_save;
-
-  gchar *uuid_of_encrypted_to_unlock;
-  gchar *desc_of_encrypted_to_unlock;
-  UDisksEncrypted *encrypted_to_unlock;
-  UDisksFilesystem *filesystem_to_mount;
-
-  gboolean checked_keyring;
-};
-
-static void
-mount_data_free (MountData *data)
-{
-  if (data->volume->mount_pending_op == data)
-    data->volume->mount_pending_op = NULL;
-
-  g_object_unref (data->simple);
-
-  g_clear_object (&data->volume);
-  g_clear_object (&data->cancellable);
-
-  if (data->mount_operation != NULL)
-    {
-      if (data->mount_operation_reply_handler_id != 0)
-        g_signal_handler_disconnect (data->mount_operation, data->mount_operation_reply_handler_id);
-      if (data->mount_operation_aborted_handler_id != 0)
-        g_signal_handler_disconnect (data->mount_operation, data->mount_operation_aborted_handler_id);
-      g_object_unref (data->mount_operation);
-    }
-
-  g_free (data->passphrase);
-  g_free (data->passphrase_from_keyring);
-
-  g_free (data->uuid_of_encrypted_to_unlock);
-  g_free (data->desc_of_encrypted_to_unlock);
-  g_clear_object (&data->encrypted_to_unlock);
-  g_clear_object (&data->filesystem_to_mount);
-  g_free (data);
-}
-
-static void
-mount_cancel_pending_op (MountData *data)
-{
-  g_cancellable_cancel (data->cancellable);
-  /* send an ::aborted signal to make the dialog go away */
-  if (data->mount_operation != NULL)
-    g_signal_emit_by_name (data->mount_operation, "aborted");
-}
-
-/* ------------------------------ */
-
-static void
-mount_command_cb (GObject       *source_object,
-                  GAsyncResult  *res,
-                  gpointer       user_data)
-{
-  MountData *data = user_data;
-  GError *error;
-  gint exit_status;
-  gchar *standard_error = NULL;
-
-  /* NOTE: for e.g. NFS and CIFS mounts we could do GMountOperation stuff and pipe a
-   * password to mount(8)'s stdin channel
-   *
-   * NOTE: if this fails because the user is not authorized (e.g. EPERM), we could
-   * run it through a polkit-ified setuid root helper
-   */
-
-  error = NULL;
-  if (!gvfs_udisks2_utils_spawn_finish (res,
-                                        &exit_status,
-                                        NULL, /* gchar **out_standard_output */
-                                        &standard_error,
-                                        &error))
-    {
-      g_simple_async_result_take_error (data->simple, error);
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-
-  if (WIFEXITED (exit_status) && WEXITSTATUS (exit_status) == 0)
-    {
-      gvfs_udisks2_volume_monitor_update (data->volume->monitor);
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-
-  g_simple_async_result_set_error (data->simple,
-                                   G_IO_ERROR,
-                                   G_IO_ERROR_FAILED,
-                                   standard_error);
-  g_simple_async_result_complete (data->simple);
-  mount_data_free (data);
-
- out:
-  g_free (standard_error);
-}
-
-/* ------------------------------ */
-
-static void
-mount_cb (GObject       *source_object,
-          GAsyncResult  *res,
-          gpointer       user_data)
-{
-  MountData *data = user_data;
-  gchar *mount_path;
-  GError *error;
-
-  error = NULL;
-  if (!udisks_filesystem_call_mount_finish (UDISKS_FILESYSTEM (source_object),
-                                            &mount_path,
-                                            res,
-                                            &error))
-    {
-      gvfs_udisks2_utils_udisks_error_to_gio_error (error);
-      g_simple_async_result_take_error (data->simple, error);
-      g_simple_async_result_complete (data->simple);
-    }
-  else
-    {
-      gvfs_udisks2_volume_monitor_update (data->volume->monitor);
-      g_simple_async_result_complete (data->simple);
-      g_free (mount_path);
-    }
-  mount_data_free (data);
-}
-
-static void
-do_mount (MountData *data)
-{
-  GVariantBuilder builder;
-
-  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
-  if (data->mount_operation == NULL)
-    {
-      g_variant_builder_add (&builder,
-                             "{sv}",
-                             "auth.no_user_interaction", g_variant_new_boolean (TRUE));
-    }
-  udisks_filesystem_call_mount (data->filesystem_to_mount,
-                                g_variant_builder_end (&builder),
-                                data->cancellable,
-                                mount_cb,
-                                data);
-}
-
-/* ------------------------------ */
-
-#ifdef HAVE_KEYRING
-static void
-luks_store_passphrase_cb (GnomeKeyringResult result,
-                          gpointer           user_data)
-{
-  MountData *data = user_data;
-  if (result == GNOME_KEYRING_RESULT_OK)
-    {
-      /* everything is good */
-      do_mount (data);
-    }
-  else
-    {
-      /* report failure */
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_FAILED,
-                                       _("Error storing passphrase in keyring (error code %d)"),
-                                       result);
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-    }
-}
-#endif
-
-
-static void do_unlock (MountData *data);
-
-
-#ifdef HAVE_KEYRING
-static void
-luks_delete_passphrase_cb (GnomeKeyringResult result,
-                           gpointer           user_data)
-{
-  MountData *data = user_data;
-  if (result == GNOME_KEYRING_RESULT_OK)
-    {
-      /* with the bad passphrase out of the way, try again */
-      g_free (data->passphrase);
-      data->passphrase = NULL;
-      do_unlock (data);
-    }
-  else
-    {
-      /* report failure */
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_FAILED,
-                                       _("Error deleting invalid passphrase from keyring (error code %d)"),
-                                       result);
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-    }
-}
-#endif
-
-static void
-unlock_cb (GObject       *source_object,
-           GAsyncResult  *res,
-           gpointer       user_data)
-{
-  MountData *data = user_data;
-  gchar *cleartext_device = NULL;
-  GError *error;
-
-  error = NULL;
-  if (!udisks_encrypted_call_unlock_finish (UDISKS_ENCRYPTED (source_object),
-                                            &cleartext_device,
-                                            res,
-                                            &error))
-    {
-#ifdef HAVE_KEYRING
-      /* If this failed with a passphrase read from the keyring, try again
-       * this time prompting the user...
-       *
-       * TODO: ideally check against something like UDISKS_ERROR_PASSPHRASE_INVALID
-       * when such a thing is available in udisks
-       */
-      if (data->passphrase_from_keyring != NULL &&
-          g_strcmp0 (data->passphrase, data->passphrase_from_keyring) == 0)
-        {
-          /* nuke the invalid passphrase from keyring... */
-          gnome_keyring_delete_password (&luks_passphrase_schema,
-                                         luks_delete_passphrase_cb,
-                                         data,
-                                         NULL, /* GDestroyNotify */
-                                         "gvfs-luks-uuid", data->uuid_of_encrypted_to_unlock,
-                                         NULL); /* sentinel */
-          goto out;
-        }
-#endif
-      gvfs_udisks2_utils_udisks_error_to_gio_error (error);
-      g_simple_async_result_take_error (data->simple, error);
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-  else
-    {
-      UDisksObject *object;
-
-      gvfs_udisks2_volume_monitor_update (data->volume->monitor);
-
-      object = udisks_client_peek_object (gvfs_udisks2_volume_monitor_get_udisks_client (data->volume->monitor),
-                                          cleartext_device);
-      data->filesystem_to_mount = object != NULL ? udisks_object_get_filesystem (object) : NULL;
-      if (data->filesystem_to_mount == NULL)
-        {
-          g_simple_async_result_set_error (data->simple,
-                                           G_IO_ERROR,
-                                           G_IO_ERROR_FAILED,
-                                           _("The unlocked device does not have a recognizable filesystem on it"));
-          g_simple_async_result_complete (data->simple);
-          mount_data_free (data);
-          goto out;
-        }
-
-#ifdef HAVE_KEYRING
-      /* passphrase worked - save it in the keyring if requested */
-      if (data->password_save != G_PASSWORD_SAVE_NEVER)
-        {
-          const gchar *keyring;
-          gchar *display_name;
-
-          switch (data->password_save)
-            {
-            case G_PASSWORD_SAVE_NEVER:
-              g_assert_not_reached ();
-              break;
-            case G_PASSWORD_SAVE_FOR_SESSION:
-              keyring = GNOME_KEYRING_SESSION;
-              break;
-            case G_PASSWORD_SAVE_PERMANENTLY:
-              keyring = GNOME_KEYRING_DEFAULT;
-              break;
-            }
-
-          display_name = g_strdup_printf (_("Encryption passphrase for %s"),
-                                          data->desc_of_encrypted_to_unlock);
-
-          gnome_keyring_store_password (&luks_passphrase_schema,
-                                        keyring,
-                                        display_name,
-                                        data->passphrase,
-                                        luks_store_passphrase_cb,
-                                        data,
-                                        NULL, /* GDestroyNotify */
-                                        "gvfs-luks-uuid", data->uuid_of_encrypted_to_unlock,
-                                        NULL); /* sentinel */
-          goto out;
-        }
-#endif
-
-      /* OK, ready to rock */
-      do_mount (data);
-    }
-
- out:
-  g_free (cleartext_device);
-}
-
-static void
-on_mount_operation_reply (GMountOperation       *mount_operation,
-                          GMountOperationResult result,
-                          gpointer              user_data)
-{
-  MountData *data = user_data;
-
-  /* we got what we wanted; don't listen to any other signals from the mount operation */
-  if (data->mount_operation_reply_handler_id != 0)
-    {
-      g_signal_handler_disconnect (data->mount_operation, data->mount_operation_reply_handler_id);
-      data->mount_operation_reply_handler_id = 0;
-    }
-  if (data->mount_operation_aborted_handler_id != 0)
-    {
-      g_signal_handler_disconnect (data->mount_operation, data->mount_operation_aborted_handler_id);
-      data->mount_operation_aborted_handler_id = 0;
-    }
-
-  if (result != G_MOUNT_OPERATION_HANDLED)
-    {
-      if (result == G_MOUNT_OPERATION_ABORTED)
-        {
-          /* The user aborted the operation so consider it "handled" */
-          g_simple_async_result_set_error (data->simple,
-                                           G_IO_ERROR,
-                                           G_IO_ERROR_FAILED_HANDLED,
-                                           "Password dialog aborted (user should never see this error since it is G_IO_ERROR_FAILED_HANDLED)");
-        }
-      else
-        {
-          g_simple_async_result_set_error (data->simple,
-                                           G_IO_ERROR,
-                                           G_IO_ERROR_PERMISSION_DENIED,
-                                           "Expected G_MOUNT_OPERATION_HANDLED but got %d", result);
-        }
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-
-  data->passphrase = g_strdup (g_mount_operation_get_password (mount_operation));
-  data->password_save = g_mount_operation_get_password_save (mount_operation);
-
-  /* Don't save password in keyring just yet - check if it works first */
-
-  do_unlock (data);
-
- out:
-  ;
-}
-
-static void
-on_mount_operation_aborted (GMountOperation       *mount_operation,
-                            gpointer              user_data)
-{
-  on_mount_operation_reply (mount_operation, G_MOUNT_OPERATION_ABORTED, user_data);
-}
-
-static gboolean
-has_crypttab_passphrase (MountData *data)
-{
-  gboolean ret = FALSE;
-  GVariantIter iter;
-  GVariant *configuration_value;
-  const gchar *configuration_type;
-
-  g_variant_iter_init (&iter, udisks_block_get_configuration (data->volume->block));
-  while (g_variant_iter_next (&iter, "(&s@a{sv})", &configuration_type, &configuration_value))
-    {
-      if (g_strcmp0 (configuration_type, "crypttab") == 0)
-        {
-          const gchar *passphrase_path;
-          if (g_variant_lookup (configuration_value, "passphrase-path", "^&ay", &passphrase_path))
-            {
-              if (passphrase_path != NULL && strlen (passphrase_path) > 0)
-                {
-                  ret = TRUE;
-                  g_variant_unref (configuration_value);
-                  goto out;
-                }
-            }
-        }
-      g_variant_unref (configuration_value);
-    }
- out:
-  return ret;
-}
-
-#ifdef HAVE_KEYRING
-static void
-luks_find_passphrase_cb (GnomeKeyringResult result,
-                         const gchar       *string,
-                         gpointer           user_data)
-{
-  MountData *data = user_data;
-
-  /* Don't fail if a keyring error occured - just continue and request
-   * the passphrase from the user...
-   */
-  if (result == GNOME_KEYRING_RESULT_OK)
-    {
-      data->passphrase = g_strdup (string);
-      data->passphrase_from_keyring = g_strdup (string);
-    }
-  /* try again */
-  do_unlock (data);
-}
-#endif
-
-static void
-do_unlock (MountData *data)
-{
-  GVariantBuilder builder;
-
-  if (data->passphrase == NULL)
-    {
-      /* If the passphrase is in the crypttab file, no need to ask the user, just use a blank passphrase */
-      if (has_crypttab_passphrase (data))
-        {
-          data->passphrase = g_strdup ("");
-        }
-      else
-        {
-          gchar *message;
-
-#ifdef HAVE_KEYRING
-          /* check if the passphrase is in the user's keyring */
-          if (!data->checked_keyring)
-            {
-              data->checked_keyring = TRUE;
-              gnome_keyring_find_password (&luks_passphrase_schema,
-                                           luks_find_passphrase_cb,
-                                           data,
-                                           NULL, /* GDestroyNotify */
-                                           "gvfs-luks-uuid", data->uuid_of_encrypted_to_unlock,
-                                           NULL); /* sentinel */
-              goto out;
-            }
-#endif
-
-          if (data->mount_operation == NULL)
-            {
-              g_simple_async_result_set_error (data->simple,
-                                               G_IO_ERROR,
-                                               G_IO_ERROR_FAILED,
-                                               _("A passphrase is required to access the volume"));
-              g_simple_async_result_complete (data->simple);
-              mount_data_free (data);
-              goto out;
-            }
-
-          data->mount_operation_reply_handler_id = g_signal_connect (data->mount_operation,
-                                                                     "reply",
-                                                                     G_CALLBACK (on_mount_operation_reply),
-                                                                     data);
-          data->mount_operation_aborted_handler_id = g_signal_connect (data->mount_operation,
-                                                                       "aborted",
-                                                                       G_CALLBACK (on_mount_operation_aborted),
-                                                                       data);
-          /* Translators: This is the message shown to users */
-          message = g_strdup_printf (_("Enter a passphrase to unlock the volume\n"
-                                       "The passphrase is needed to access encrypted data on %s."),
-                                     data->desc_of_encrypted_to_unlock);
-
-          /* NOTE: We (currently) don't offer the user to save the
-           * passphrase in the keyring or /etc/crypttab - compared to
-           * the gdu volume monitor (that used the keyring for this)
-           * this is a "regression" but it's done this way on purpose
-           * because
-           *
-           *  - if the device is encrypted, it was probably the intent
-           *    that the passphrase is to be used every time it's used
-           *
-           *  - supporting both /etc/crypttab and the keyring is confusing
-           *    and leaves the user to wonder where the key is stored.
-           *
-           *  - the user can add an /etc/crypttab entry himself either
-           *    manually or through palimpsest
-           */
-          g_signal_emit_by_name (data->mount_operation,
-                                 "ask-password",
-                                 message,
-                                 NULL,
-                                 NULL,
-                                 G_ASK_PASSWORD_NEED_PASSWORD |
-                                 G_ASK_PASSWORD_SAVING_SUPPORTED);
-          g_free (message);
-          goto out;
-        }
-    }
-
-  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
-  if (data->mount_operation == NULL)
-    {
-      g_variant_builder_add (&builder,
-                             "{sv}",
-                             "auth.no_user_interaction", g_variant_new_boolean (TRUE));
-    }
-  udisks_encrypted_call_unlock (data->encrypted_to_unlock,
-                                data->passphrase,
-                                g_variant_builder_end (&builder),
-                                data->cancellable,
-                                unlock_cb,
-                                data);
- out:
-  ;
-}
-
-
-static void
-gvfs_udisks2_volume_mount (GVolume             *_volume,
-                           GMountMountFlags     flags,
-                           GMountOperation     *mount_operation,
-                           GCancellable        *cancellable,
-                           GAsyncReadyCallback  callback,
-                           gpointer             user_data)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  GDBusObject *object;
-  UDisksBlock *block;
-  UDisksFilesystem *filesystem;
-  MountData *data;
-
-  data = g_new0 (MountData, 1);
-  data->simple = g_simple_async_result_new (G_OBJECT (volume),
-                                            callback,
-                                            user_data,
-                                            gvfs_udisks2_volume_mount);
-  data->volume = g_object_ref (volume);
-  data->cancellable = cancellable != NULL ? g_object_ref (cancellable) : NULL;
-  data->mount_operation = mount_operation != NULL ? g_object_ref (mount_operation) : NULL;
-
-  if (volume->mount_pending_op != NULL)
-    {
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_FAILED,
-                                       "A mount operation is already pending");
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-  volume->mount_pending_op = data;
-
-  /* Use the mount(8) command if there is no block device */
-  if (volume->block == NULL)
-    {
-      gchar *escaped_mount_path;
-      escaped_mount_path = g_strescape (g_unix_mount_point_get_mount_path (data->volume->mount_point), NULL);
-      gvfs_udisks2_utils_spawn (10, /* timeout in seconds */
-                                data->cancellable,
-                                mount_command_cb,
-                                data,
-                                "mount \"%s\"",
-                                escaped_mount_path);
-      g_free (escaped_mount_path);
-      goto out;
-    }
-
-  /* if encrypted and already unlocked, just mount the cleartext block device */
-  block = udisks_client_get_cleartext_block (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                             volume->block);
-  if (block != NULL)
-    g_object_unref (block);
-  else
-    block = volume->block;
-
-  object = g_dbus_interface_get_object (G_DBUS_INTERFACE (block));
-  if (object == NULL)
-    {
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_FAILED,
-                                       "No object for D-Bus interface");
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-
-  filesystem = udisks_object_peek_filesystem (UDISKS_OBJECT (object));
-  if (filesystem == NULL)
-    {
-      data->encrypted_to_unlock = udisks_object_get_encrypted (UDISKS_OBJECT (object));
-      if (data->encrypted_to_unlock != NULL)
-        {
-          UDisksDrive *udisks_drive;
-
-          /* This description is used in both the prompt and the display-name of
-           * the key stored in the user's keyring ...
-           *
-           * NOTE: we want a little bit more detail than what g_drive_get_name()
-           * gives us, since this is going to be used to refer to the device even
-           * when not plugged in
-           */
-          udisks_drive = udisks_client_get_drive_for_block (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                                            block);
-          if (udisks_drive != NULL)
-            {
-              gchar *drive_name;
-              gchar *drive_desc;
-              udisks_client_get_drive_info (gvfs_udisks2_volume_monitor_get_udisks_client (volume->monitor),
-                                            udisks_drive,
-                                            &drive_name,
-                                            &drive_desc,
-                                            NULL,  /* drive_icon */
-                                            NULL,  /* media_desc */
-                                            NULL); /* media_icon */
-              /* Translators: this is used to describe the drive the encrypted media
-               * is on - the first %s is the name (such as 'WD 2500JB External'), the
-               * second %s is the description ('250 GB Hard Disk').
-               */
-              data->desc_of_encrypted_to_unlock = g_strdup_printf (_("%s (%s)"),
-                                                                   drive_name,
-                                                                   drive_desc);
-              g_free (drive_desc);
-              g_free (drive_name);
-              g_object_unref (udisks_drive);
-            }
-          else
-            {
-              data->desc_of_encrypted_to_unlock = udisks_block_dup_preferred_device (block);
-            }
-          data->uuid_of_encrypted_to_unlock = udisks_block_dup_id_uuid (block);
-
-          do_unlock (data);
-          goto out;
-        }
-
-      g_simple_async_result_set_error (data->simple,
-                                       G_IO_ERROR,
-                                       G_IO_ERROR_FAILED,
-                                       "No .Filesystem or .Encrypted interface on D-Bus object");
-      g_simple_async_result_complete (data->simple);
-      mount_data_free (data);
-      goto out;
-    }
-
-  data->filesystem_to_mount = g_object_ref (filesystem);
-  do_mount (data);
-
- out:
-  ;
-}
-
-static gboolean
-gvfs_udisks2_volume_mount_finish (GVolume       *volume,
-                                  GAsyncResult  *result,
-                                  GError       **error)
-{
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-  return !g_simple_async_result_propagate_error (simple, error);
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-typedef struct
-{
-  GObject *object;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-} EjectWrapperOp;
-
-static void
-eject_wrapper_callback (GObject      *source_object,
-                        GAsyncResult *res,
-                        gpointer      user_data)
-{
-  EjectWrapperOp *data  = user_data;
-  data->callback (data->object, res, data->user_data);
-  g_object_unref (data->object);
-  g_free (data);
-}
-
-static void
-gvfs_udisks2_volume_eject_with_operation (GVolume              *_volume,
-                                          GMountUnmountFlags   flags,
-                                          GMountOperation     *mount_operation,
-                                          GCancellable        *cancellable,
-                                          GAsyncReadyCallback  callback,
-                                          gpointer             user_data)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  GVfsUDisks2Drive *drive;
-
-  drive = NULL;
-  if (volume->drive != NULL)
-    drive = g_object_ref (volume->drive);
-
-  if (drive != NULL)
-    {
-      EjectWrapperOp *data;
-      data = g_new0 (EjectWrapperOp, 1);
-      data->object = g_object_ref (volume);
-      data->callback = callback;
-      data->user_data = user_data;
-      g_drive_eject_with_operation (G_DRIVE (drive), flags, mount_operation, cancellable, eject_wrapper_callback, data);
-      g_object_unref (drive);
-    }
-  else
-    {
-      GSimpleAsyncResult *simple;
-      simple = g_simple_async_result_new_error (G_OBJECT (volume),
-                                                callback,
-                                                user_data,
-                                                G_IO_ERROR,
-                                                G_IO_ERROR_FAILED,
-                                                _("Operation not supported by backend"));
-      g_simple_async_result_complete (simple);
-      g_object_unref (simple);
-    }
-}
-
-static gboolean
-gvfs_udisks2_volume_eject_with_operation_finish (GVolume        *_volume,
-                                                 GAsyncResult  *result,
-                                                 GError       **error)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  gboolean ret = TRUE;
-
-  if (volume->drive != NULL)
-    {
-      ret = g_drive_eject_with_operation_finish (G_DRIVE (volume->drive), result, error);
-    }
-  else
-    {
-      g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error);
-      ret = FALSE;
-    }
-  return ret;
-}
-
-static void
-gvfs_udisks2_volume_eject (GVolume              *volume,
-                           GMountUnmountFlags   flags,
-                           GCancellable        *cancellable,
-                           GAsyncReadyCallback  callback,
-                           gpointer             user_data)
-{
-  gvfs_udisks2_volume_eject_with_operation (volume, flags, NULL, cancellable, callback, user_data);
-}
-
-static gboolean
-gvfs_udisks2_volume_eject_finish (GVolume        *volume,
-                                  GAsyncResult  *result,
-                                  GError       **error)
-{
-  return gvfs_udisks2_volume_eject_with_operation_finish (volume, result, error);
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static const gchar *
-gvfs_udisks2_volume_get_sort_key (GVolume *_volume)
-{
-  GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (_volume);
-  return volume->sort_key;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-static void
-gvfs_udisks2_volume_volume_iface_init (GVolumeIface *iface)
-{
-  iface->get_name = gvfs_udisks2_volume_get_name;
-  iface->get_icon = gvfs_udisks2_volume_get_icon;
-  iface->get_uuid = gvfs_udisks2_volume_get_uuid;
-  iface->get_drive = gvfs_udisks2_volume_get_drive;
-  iface->get_mount = gvfs_udisks2_volume_get_mount;
-  iface->can_mount = gvfs_udisks2_volume_can_mount;
-  iface->can_eject = gvfs_udisks2_volume_can_eject;
-  iface->should_automount = gvfs_udisks2_volume_should_automount;
-  iface->get_activation_root = gvfs_udisks2_volume_get_activation_root;
-  iface->enumerate_identifiers = gvfs_udisks2_volume_enumerate_identifiers;
-  iface->get_identifier = gvfs_udisks2_volume_get_identifier;
-
-  iface->mount_fn = gvfs_udisks2_volume_mount;
-  iface->mount_finish = gvfs_udisks2_volume_mount_finish;
-  iface->eject = gvfs_udisks2_volume_eject;
-  iface->eject_finish = gvfs_udisks2_volume_eject_finish;
-  iface->eject_with_operation = gvfs_udisks2_volume_eject_with_operation;
-  iface->eject_with_operation_finish = gvfs_udisks2_volume_eject_with_operation_finish;
-  iface->get_sort_key = gvfs_udisks2_volume_get_sort_key;
-}
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-UDisksBlock *
-gvfs_udisks2_volume_get_block (GVfsUDisks2Volume *volume)
-{
-  g_return_val_if_fail (GVFS_IS_UDISKS2_VOLUME (volume), NULL);
-  return volume->block;
-}
-
-GUnixMountPoint *
-gvfs_udisks2_volume_get_mount_point (GVfsUDisks2Volume *volume)
-{
-  g_return_val_if_fail (GVFS_IS_UDISKS2_VOLUME (volume), NULL);
-  return volume->mount_point;
-}
-
-dev_t
-gvfs_udisks2_volume_get_dev (GVfsUDisks2Volume *volume)
-{
-  g_return_val_if_fail (GVFS_IS_UDISKS2_VOLUME (volume), 0);
-  return volume->dev;
-}
-
-gboolean
-gvfs_udisks2_volume_has_uuid (GVfsUDisks2Volume *volume,
-                              const gchar       *uuid)
-{
-  g_return_val_if_fail (GVFS_IS_UDISKS2_VOLUME (volume), FALSE);
-  return g_strcmp0 (volume->uuid, uuid) == 0;
-}

=== removed directory '.pc/01_modules_dir.patch'
=== removed file '.pc/01_modules_dir.patch/configure.ac'
--- .pc/01_modules_dir.patch/configure.ac	2012-06-28 10:42:45 +0000
+++ .pc/01_modules_dir.patch/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,826 +0,0 @@
-AC_PREREQ([2.64])
-
-AC_INIT([gvfs],[1.13.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
-AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-pax])
-AM_CONFIG_HEADER(config.h)
-
-AM_SANITY_CHECK
-
-AC_C_CONST
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AM_DISABLE_STATIC
-AM_PROG_LIBTOOL
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules, no)
-AM_PROG_CC_C_O
-AC_PROG_SED
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-
-GLIB_GSETTINGS
-
-AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif])
-	
-saved_CFLAGS=$CFLAGS
-AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-CFLAGS=$saved_CFLAGS
-
-LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
-			
-GTK_DOC_CHECK
-DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.0 gobject-2.0 gmodule-no-export-2.0 gio-unix-2.0 gio-2.0 )
-
-PKG_CHECK_MODULES(DBUS, dbus-1)
-
-AC_ARG_WITH(dbus_service_dir,
-		AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]),
-            with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
-DBUS_SERVICE_DIR=$with_dbus_service_dir
-AC_SUBST(DBUS_SERVICE_DIR)
-
-giomodulesdir=$libdir/gio/modules
-AC_SUBST(giomodulesdir)
-
-dnl ****************************
-dnl *** Checks for intltool  ***
-dnl ****************************
-
-IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE=gvfs
-
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])
-AM_GLIB_GNU_GETTEXT
-
-dnl ****************************
-dnl *** Checks for gettext   ***
-dnl ****************************
-
-dnl *** disabled by now, using intltool ***
-dnl *** we'll revert when glib-gettexttize will be able
-dnl *** to manage [enconding: UTF-8] in POTIFILES.in
-
-dnl GETTEXT_PACKAGE=gvfs
-dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
-dnl AC_SUBST(GETTEXT_PACKAGE)
-
-dnl ALL_LINGUAS=""
-
-dnl AM_GLIB_GNU_GETTEXT
-
-dnl LIBS="$LIBS $INTLLIBS"
-
-dnl AM_GLIB_DEFINE_LOCALEDIR(GVFS_LOCALEDIR)
-
-dnl ****************************
-dnl *** Checks for ssh stuff ***
-dnl ****************************
-
-AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
-
-dnl ****************************
-dnl *** Checks for pty stuff ***
-dnl ****************************
-
-AC_CHECK_HEADERS(sys/un.h stropts.h termios.h util.h utmp.h sys/uio.h sys/param.h)
-
-# Check for PTY handling functions.
-AC_CHECK_FUNCS(getpt posix_openpt grantpt unlockpt ptsname ptsname_r)
-
-# Pull in the right libraries for various functions which might not be
-# bundled into an exploded libc.
-AC_CHECK_FUNC(socketpair,[have_socketpair=1],AC_CHECK_LIB(socket,socketpair,[have_socketpair=1; LIBS="$LIBS -lsocket"]))
-if test x$have_socketpair = x1 ; then
-	AC_DEFINE(HAVE_SOCKETPAIR,1,[Define if you have the socketpair function.])
-fi
-
-AC_SEARCH_LIBS(login_tty, util, [AC_DEFINE([HAVE_LOGIN_TTY],[],[Whether login_tty is available])])
-
-dnl **************************************************
-dnl *** Check if we should build with http backend ***
-dnl **************************************************
-AC_ARG_ENABLE(http, AS_HELP_STRING([--disable-http],[build without http/dav backend]))
-msg_http=no
-HTTP_CFLAGS=
-HTTP_LIBS=
-
-if test "x$enable_http" != "xno"; then
-  PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.26.0, msg_http=yes)
-
-  if test "x$msg_http" = "xyes"; then
-    PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0)
-    AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built])
-  fi
-fi
-
-AC_SUBST(HTTP_CFLAGS)
-AC_SUBST(HTTP_LIBS)
-AM_CONDITIONAL(HAVE_HTTP, [test "$msg_http" = "yes"])
-
-dnl **************************************************
-dnl *** Check if we should build with DNS-SD backend ***
-dnl **************************************************
-AM_CONDITIONAL(HAVE_AVAHI, false)
-			  
-AC_ARG_ENABLE(avahi, AS_HELP_STRING([--disable-avahi],[build without avahi support]))
-msg_avahi=no
-if test "x$enable_avahi" != "xno"; then
-	PKG_CHECK_MODULES(AVAHI, avahi-glib >= 0.6 avahi-client >= 0.6,
-		  	[AM_CONDITIONAL(HAVE_AVAHI, true)
-		   	AC_DEFINE(HAVE_AVAHI, [], [Set if we can use avahi])]
-                        msg_avahi=yes,
-	          	[AM_CONDITIONAL(HAVE_AVAHI, false)])
-	AC_SUBST(AVAHI_CFLAGS)
-	AC_SUBST(AVAHI_LIBS)
-fi
-
-dnl ************************
-dnl *** Check for libXML ***
-dnl ************************
-PKG_CHECK_MODULES(LIBXML, libxml-2.0,
-	[AM_CONDITIONAL(HAVE_LIBXML, true)
-	AC_DEFINE(HAVE_LIBXML, [], [Set if we have libxml])]
-	msg_libxml=yes,
-        [AM_CONDITIONAL(HAVE_LIBXML, false)])
-
-dnl *************************
-dnl *** Check for libudev ***
-dnl *************************
-AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev],[build without libudev]))
-msg_udev=no
-UDEV_CFLAGS=
-UDEV_LIBS=
-
-if test "x$enable_udev" != "xno"; then
-  PKG_CHECK_EXISTS(libudev >= 138, msg_udev=yes)
-
-  if test "x$msg_udev" = "xyes"; then
-    PKG_CHECK_MODULES(UDEV, libudev)
-    AC_DEFINE(HAVE_LIBUDEV, 1, [Define to 1 if libudev availible])
-  fi
-fi
-
-dnl **********************
-dnl *** Check for FUSE ***
-dnl **********************
-AC_ARG_ENABLE(fuse, AS_HELP_STRING([--disable-fuse],[build without FUSE support]))
-msg_fuse=no
-FUSE_LIBS=
-FUSE_CFLAGS=
-
-if test "x$enable_fuse" != "xno"; then
-  PKG_CHECK_EXISTS(fuse, msg_fuse=yes)
-
-  if test "x$msg_fuse" = "xyes"; then
-    PKG_CHECK_MODULES(FUSE, fuse >= 2.8.0)
-    AC_DEFINE(HAVE_FUSE, 1, [Define to 1 if FUSE is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_FUSE, [test "$msg_fuse" = "yes"])
-
-dnl ************************************
-dnl *** Check for gnome-disk-utility ***
-dnl ************************************
-
-AC_ARG_ENABLE(gdu, AS_HELP_STRING([--disable-gdu],[build without GDU volume monitor]))
-msg_gdu=no
-GDU_LIBS=
-GDU_CFLAGS=
-GDU_REQUIRED=3.0.2
-
-if test "x$enable_gdu" != "xno"; then
-  PKG_CHECK_EXISTS([gdu >= $GDU_REQUIRED], msg_gdu=yes)
-
-  if test "x$msg_gdu" = "xyes"; then
-    PKG_CHECK_MODULES([GDU],[gdu >= $GDU_REQUIRED])
-    AC_DEFINE(HAVE_GDU, 1, [Define to 1 if gnome-disk-utility is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_GDU, [test "$msg_gdu" = "yes"])
-
-dnl *************************
-dnl *** Check for udisks2 ***
-dnl *************************
-
-AC_ARG_ENABLE(udisks2, AS_HELP_STRING([--disable-udisks2],[build without libudisks2]))
-msg_udisks2=no
-UDISKS2_LIBS=
-UDISKS2_CFLAGS=
-UDISKS2_REQUIRED=1.90
-
-if test "x$enable_udisks2" != "xno"; then
-  PKG_CHECK_EXISTS([udisks2 >= $UDISKS2_REQUIRED], msg_udisks2=yes)
-
-  if test "x$msg_udisks2" = "xyes"; then
-    PKG_CHECK_MODULES([UDISKS2],[udisks2 >= $UDISKS2_REQUIRED])
-    AC_DEFINE(HAVE_UDISKS2, 1, [Define to 1 if libudisks2 is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_UDISKS2, [test "$msg_udisks2" = "yes"])
-
-dnl **********************************
-dnl *** Check for libsystemd-login ***
-dnl **********************************
-
-AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login]))
-msg_libsystemd_login=no
-LIBSYSTEMD_LOGIN_LIBS=
-LIBSYSTEMD_LOGIN_CFLAGS=
-LIBSYSTEMD_LOGIN_REQUIRED=44
-
-if test "x$enable_libsystemd_login" != "xno"; then
-  PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)
-
-  if test "x$msg_libsystemd_login" = "xyes"; then
-    PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])
-    AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
-
-dnl **********************
-dnl *** Check for HAL ***
-dnl **********************
-AC_ARG_ENABLE(hal, AS_HELP_STRING([--disable-hal],[build without HAL support]))
-msg_hal=no
-have_hal_fast_init=no
-HAL_LIBS=
-HAL_CFLAGS=
-HAL_REQUIRED=0.5.10
-
-if test "x$enable_hal" != "xno" && test "x$msg_gdu" = "xno"; then
-  PKG_CHECK_EXISTS([hal >= $HAL_REQUIRED], msg_hal=yes)
-
-  if test "x$msg_hal" = "xyes"; then
-    PKG_CHECK_MODULES([HAL],[hal >= $HAL_REQUIRED])
-    AC_DEFINE(HAVE_HAL, 1, [Define to 1 if HAL is available])
-    save_libs="$LIBS"
-    LIBS="$HAL_LIBS"
-    AC_CHECK_LIB(hal, libhal_get_all_devices_with_properties, have_hal_fast_init=yes)
-    if test "x$have_hal_fast_init" = "xyes"; then
-      AC_DEFINE(HAVE_HAL_FAST_INIT, 1, [Define to 1 if libhal_get_all_devices_with_properties is available])
-    fi
-    LIBS="$save_libs"
-  fi
-fi
-
-AM_CONDITIONAL(USE_HAL, [test "$msg_hal" = "yes"])
-
-dnl **********************
-dnl *** Check for gudev ***
-dnl **********************
-AC_ARG_ENABLE(gudev, AS_HELP_STRING([--disable-gudev],[build without gudev support]))
-msg_gudev=no
-GUDEV_REQUIRED=001
-
-if test "x$enable_gudev" != "xno"; then
-  PKG_CHECK_EXISTS([gudev-1.0 >= $GUDEV_REQUIRED], msg_gudev=yes)
-
-  if test "x$msg_gudev" = "xyes"; then
-    PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= $GUDEV_REQUIRED])
-    AC_DEFINE(HAVE_GUDEV, 1, [Define to 1 if gudev is available])
-  fi
-fi
-AM_CONDITIONAL(USE_GUDEV, [test "$msg_gudev" = "yes"])
-
-if test "x$msg_gudev" = "xyes"; then
-  msg_hotplug_backend="gudev"
-else 
-  if test "x$msg_hal" = "xyes"; then
-    msg_hotplug_backend="hal"
-  else
-    msg_hotplug_backend="none"
-  fi
-fi
-
-dnl **************************************************
-dnl *** Check if we should build with CDDA backend ***
-dnl **************************************************
-AC_ARG_ENABLE(cdda, AS_HELP_STRING([--disable-cdda],[build without CDDA backend]))
-msg_cdda=no
-CDDA_LIBS=
-CDDA_CFLAGS=
-
-if test "x$enable_cdda" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
-  PKG_CHECK_EXISTS(libcdio_paranoia >= 0.78.2, msg_cdda=yes)
-
-  if test "x$msg_cdda" = "xyes"; then
-    PKG_CHECK_MODULES(CDDA, libcdio_paranoia)
-    AC_DEFINE(HAVE_CDDA, 1, [Define to 1 if CDDA is going to be built])
-  fi
-fi
-
-AM_CONDITIONAL(USE_CDDA, [test "$msg_cdda" = "yes"])
-
-dnl *************************************************
-dnl *** Check if we should build with AFC backend ***
-dnl *************************************************
-AC_ARG_ENABLE(afc, AS_HELP_STRING([--disable-afc],[build without AFC backend]))
-msg_afc=no
-AFC_LIBS=
-AFC_CFLAGS=
-
-if test "x$enable_afc" != "xno" ; then
-  PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes)
-
-  if test "x$msg_afc" = "xyes"; then
-    PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
-    AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
-    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
-                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
-                                [Define to 1 if libimobiledevice-1.1.2 found])])
-  fi
-fi
-
-AC_SUBST(AFC_LIBS)
-AC_SUBST(AFC_CFLAGS)
-
-AM_CONDITIONAL(USE_AFC, [test "$msg_afc" = "yes"])
-
-dnl *****************************************************
-dnl *** Check if we should build with obexftp backend ***
-dnl *****************************************************
-AC_ARG_ENABLE(obexftp, AS_HELP_STRING([--disable-obexftp],[build without ObexFTP backend]))
-msg_obexftp=no
-OBEXFTP_LIBS=
-OBEXFTP_CFLAGS=
-
-if test "x$enable_obexftp" != "xno";  then
-  PKG_CHECK_EXISTS(dbus-glib-1 bluez >= 4.0, msg_obexftp=yes)
-
-  dnl Make sure we have expat
-  AC_CHECK_LIB(expat, XML_ParserCreate_MM,
-               [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
-               have_expat=false)
-
-  if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
-    PKG_CHECK_MODULES(OBEXFTP, dbus-glib-1 bluez >= 4.0)
-    AC_SUBST(OBEXFTP_LIBS)
-    AC_SUBST(OBEXFTP_CFLAGS)
-
-    msg_obexftp=yes
-    AC_DEFINE(HAVE_OBEXFTP, 1, [Define to 1 if ObexFTP is going to be built])
-    EXPAT_CFLAGS=""
-    EXPAT_LIBS="-lexpat"
-  else
-    msg_obexftp=no
-  fi
-fi
-
-AC_SUBST(EXPAT_CFLAGS)
-AC_SUBST(EXPAT_LIBS)
-AM_CONDITIONAL(USE_OBEXFTP, [test "$msg_obexftp" = "yes"])
-
-dnl *************************
-dnl *** Check for gphoto2 ***
-dnl *************************
-AC_ARG_ENABLE(gphoto2, AS_HELP_STRING([--disable-gphoto2],[build without gphoto2 support]))
-msg_gphoto2=no
-GPHOTO2_LIBS=
-GPHOTO2_CFLAGS=
-
-if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
-  PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0, [msg_gphoto2=yes])
-
-  # Need OS tweaks in hal volume monitor backend
-  case "$host" in
-    *-linux* | *-freebsd* | *-kfreebsd*-gnu)
-      use_gphoto2=yes
-      ;;
-    *)
-      use_gphoto2=no
-      ;;
-  esac
-
-  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
-    AC_MSG_ERROR([gphoto2 support requested but not available])
-  fi
-
-  if test "x$msg_gphoto2" = "xyes"; then
-    if test "x$use_gphoto2" = "xyes"; then
-      AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
-    else
-      if test "x$enable_gphoto2" = "xyes"; then
-        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-      else
-        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-      fi
-      msg_gphoto2=no
-    fi
-  fi
-fi
-
-AM_CONDITIONAL(USE_GPHOTO2, [test "$msg_gphoto2" = "yes"])
-
-dnl *******************************
-dnl *** Check for GNOME Keyring ***
-dnl *******************************
-AC_ARG_ENABLE(keyring, AS_HELP_STRING([--disable-keyring],[build without GNOME Keyring support]))
-msg_keyring=no
-KEYRING_LIBS=
-KEYRING_CFLAGS=
-
-if test "x$enable_keyring" != "xno"; then
-  PKG_CHECK_EXISTS(gnome-keyring-1, msg_keyring=yes)
-
-  if test "x$msg_keyring" = "xyes"; then
-    PKG_CHECK_MODULES(KEYRING, gnome-keyring-1)
-    AC_DEFINE(HAVE_KEYRING, 1, [Define to 1 if GNOME Keyring is available])
-  fi
-fi
-
-AM_CONDITIONAL(USE_KEYRING, [test "$msg_keyring" = "yes"])
-
-dnl ***********************************************
-dnl *** Check if we should build with libbluray ***
-dnl ***********************************************
-AC_ARG_ENABLE(bluray, AS_HELP_STRING([--disable-bluray],[build without bluray metadata support]))
-msg_bluray=no
-BLURAY_CFLAGS=
-BLURAY_LIBS=
-
-if test "x$enable_bluray" != "xno"; then
-  PKG_CHECK_EXISTS(libbluray, msg_bluray=yes)
-
-  if test "x$msg_bluray" = "xyes"; then
-    PKG_CHECK_MODULES(BLURAY, libbluray)
-    AC_DEFINE(HAVE_BLURAY, 1, [Define to 1 if bluray metadata is going to be built])
-  fi
-fi
-
-AC_SUBST(BLURAY_CFLAGS)
-AC_SUBST(BLURAY_LIBS)
-AM_CONDITIONAL(HAVE_BLURAY, [test "$msg_bluray" = "yes"])
-
-dnl ==========================================================================
-dnl Samba 3.0
-
-AC_ARG_ENABLE(samba, AS_HELP_STRING([--disable-samba],[build without samba support]))
-msg_samba="no"
-if test "x$enable_samba" != "xno"; then
-  AC_ARG_WITH(samba-includes, AS_HELP_STRING([--with-samba-includes=PREFIX],[Location of samba includes.]),
-	      with_samba_includes="$withval", with_samba_includes="/usr/include")
-  have_samba_includes="no"
-  if test "x${with_samba_includes}" != "xno"; then
-	CPPFLAGS_save="$CPPFLAGS"
-
-	CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
-	AC_CHECK_HEADER(libsmbclient.h, [ samba_includes="yes" ])
-	CPPFLAGS="$CPPFLAGS_save"
-	
-	if test "x{samba_includes}" != "xno" -a "x${samba_includes}" != "x"; then
-		have_samba_includes="yes"
-		if test "${with_samba_includes}" != "/usr/include" ; then
-			SAMBA_CFLAGS="-I$with_samba_includes"
-		else
-			SAMBA_CFLAGS=""
-		fi
-		
-		CPPFLAGS="$CPPFLAGS -I$with_samba_includes"
-		AC_CHECK_MEMBER(SMBCCTX.flags,
-				[AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags available in SMBCCTXT])],,
-				[#include <libsmbclient.h>])
-		AC_CHECK_MEMBER(SMBCCTX.close,
-				[AC_DEFINE(HAVE_SAMBA_OLD_CLOSE, , [Defined if old close is available in SMBCCTXT])],,
-				[#include <libsmbclient.h>])
-		CPPFLAGS="$CPPFLAGS_save"
-	else
-		SAMBA_CFLAGS=""
-	fi
-  fi
-  AC_ARG_WITH(samba-libs, AS_HELP_STRING([--with-samba-libs=PREFIX],[Location of Samba libs.]),
-	      with_samba_libs="$withval", with_samba_libs="/usr/lib")
-  if test "x${with_samba_libs}" != "xno" -a "x${have_samba_includes}" != "xno"; then
-	LDFLAGS_save="$LDFLAGS"
-	
-	LDFLAGS="$LDFLAGS -L$with_samba_libs"
-	AC_CHECK_LIB(smbclient, smbc_option_get,samba_libs="yes", samba_libs="no")
-	LDFLAGS="$LDFLAGS_save"
-	if test "x${samba_libs}" != "xno"; then
-		AC_DEFINE(HAVE_SAMBA,, [Define to 1 if you have the samba 3.0 libraries])
-		msg_samba="yes"
-                if test x$with_samba_libs != x/usr/lib; then
-                        SAMBA_LIBS="-L$with_samba_libs -lsmbclient"
-                else
-                	SAMBA_LIBS="-lsmbclient"
-                fi
-                AC_CHECK_LIB(smbclient, smbc_getFunctionStatVFS, 
-                        AC_DEFINE(HAVE_SAMBA_STAT_VFS, , [Define to 1 if smbclient supports smbc_stat_fn]))
-	else
-		AC_CHECK_LIB(smbclient, smbc_new_context,samba_old_libs="yes", samba_old_libs="no")
-		if test "x${samba_old_libs}" != "xno"; then
-		   msg_samba="Too old, need at least samba 3.0.22"
-		fi
-		SAMBA_CFLAGS=""
-		SAMBA_LIBS=""
-	fi
-  fi
-  AC_MSG_CHECKING(for Samba 3.0 libraries)
-  AC_MSG_RESULT($msg_samba)
-fi
-AM_CONDITIONAL(HAVE_SAMBA, test "$msg_samba" = "yes")
-AC_SUBST(SAMBA_CFLAGS)
-AC_SUBST(SAMBA_LIBS)
-
-dnl ==========================================================================
-
-dnl ****************************
-dnl *** Check for libarchive ***
-dnl ****************************
-
-AC_ARG_ENABLE(archive, AS_HELP_STRING([--disable-archive],[build without archive support]))
-msg_archive="no"
-if test "x$enable_archive" != "xno"; then
-  AC_ARG_WITH(archive-includes, AS_HELP_STRING([--with-archive-includes=PREFIX],[Location of archive includes.]),
-	      with_archive_includes="$withval", with_archive_includes="/usr/include")
-  have_archive_includes="no"
-  if test "x${with_archive_includes}" != "xno"; then
-	CPPFLAGS_save="$CPPFLAGS"
-
-	CPPFLAGS="$CPPFLAGS -I$with_archive_includes"
-	AC_CHECK_HEADER(archive.h, [ archive_includes="yes" ])
-	CPPFLAGS="$CPPFLAGS_save"
-	
-	if test "x{archive_includes}" != "xno" -a "x${archive_includes}" != "x"; then
-		have_archive_includes="yes"
-		if test "${with_archive_includes}" != "/usr/include" ; then
-			ARCHIVE_CFLAGS="-I$with_archive_includes"
-		else
-			ARCHIVE_CFLAGS=""
-		fi
-	else
-		ARCHIVE_CFLAGS=""
-	fi
-  fi
-  AC_ARG_WITH(archive-libs, AS_HELP_STRING ([--with-archive-libs=PREFIX],[Location of Archive libs.]),
-	      with_archive_libs="$withval", with_archive_libs="/usr/lib")
-  if test "x${with_archive_libs}" != "xno" -a "x${have_archive_includes}" != "xno"; then
-	LDFLAGS_save="$LDFLAGS"
-	
-	LDFLAGS="$LDFLAGS -L$with_archive_libs"
-	AC_CHECK_LIB(archive, archive_entry_filetype, archive_libs="yes", archive_libs="no")
-	LDFLAGS="$LDFLAGS_save"
-	if test "x${archive_libs}" != "xno"; then
-		AC_DEFINE(HAVE_ARCHIVE,, [Define to 1 if you have the libarchive library])
-		msg_archive="yes"
-                if test x$with_archive_libs != x/usr/lib; then
-                        ARCHIVE_LIBS="-L$with_archive_libs -larchive"
-                else
-                	ARCHIVE_LIBS="-larchive"
-                fi
-	else
-		AC_CHECK_LIB(archive, archive_entry_filetype, archive_old_libs="yes", archive_old_libs="no")
-		if test "x${archive_old_libs}" != "xno"; then
-		   msg_archive="Too old, need at least archive 3.0.22"
-		fi
-		ARCHIVE_CFLAGS=""
-		ARCHIVE_LIBS=""
-	fi
-  fi
-  AC_MSG_CHECKING(for Archive 3.libraries)
-  AC_MSG_RESULT($msg_archive)
-fi
-AM_CONDITIONAL(HAVE_ARCHIVE, test "$msg_archive" = "yes")
-AC_SUBST(ARCHIVE_CFLAGS)
-AC_SUBST(ARCHIVE_LIBS)
-
-dnl ***************************
-dnl *** Check for libgcrypt ***
-dnl ***************************
-GCRYPT_VERSION=1.2.2
-GCRYPT_LIBVER=1
-
-AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION, have_gcrypt="yes",
-	      have_gcrypt="no")
-
-if test "x$have_gcrypt" != "xno"; then
-  AC_DEFINE(HAVE_GCRYPT, 1, [Define to 1 if libgcrypt is available])
-fi
-AC_SUBST([LIBGCRYPT_CFLAGS])
-AC_SUBST([LIBGCRYPT_LIBS])
-
-dnl *******************
-dnl *** AFP backend ***
-dnl *******************
-AC_ARG_ENABLE(afp, AS_HELP_STRING([--disable-afp], [build without AFP support]))
-msg_afp="no"
-if test "x$enable_afp" != "xno"; then
-
-  if test "x$have_gcrypt" = "xyes"; then
-    msg_afp="yes"
-  else
-    msg_afp="partial (crypt support missing! Only anonymous logins)"
-  fi
-fi
-AM_CONDITIONAL(USE_AFP, test "x$enable_afp" != "xno")
-
-dnl Install bash-completion file?
-AC_ARG_ENABLE([bash-completion],
-	      AC_HELP_STRING([--disable-bash-completion],
-			     [build without bash-completion support]),
-	      msg_bash_completion=$enableval,
-	      msg_bash_completion=yes)
-if test "x$enable_bash_completion" != "xno"; then
-  msg_bash_completion=yes
-fi
-AM_CONDITIONAL(ENABLE_BASHCOMP, test "$msg_bash_completion" = "yes")
-
-AC_ARG_WITH([bash-completion-dir],
-	    AC_HELP_STRING([--with-bash-completion-dir=PATH],
-	    		   [choose directory for bash-completion file (default=DATADIR/bash-completion/completions)]),
-	    with_bashcomp_dir=$withval,
-	    with_bashcomp_dir=$datadir/bash-completion/completions)
-BASHCOMP_DIR=$with_bashcomp_dir
-AC_SUBST(BASHCOMP_DIR)
-
-dnl ==========================================================================
-	
-dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions
-AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions])
-
-dnl ==========================================================================
-	
-AC_DEFINE(_FILE_OFFSET_BITS, 64, [Enable LFS])
-		       
-dnl ==========================================================================
-
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
-dnl ==========================================================================
-dnl Look for various fs info getters
-
-AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/vfs.h sys/mount.h sys/param.h])
-AC_CHECK_FUNCS(statvfs statfs)
-AC_CHECK_MEMBERS([struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#ifdef HAVE_SYS_STATFS_H
-#include <sys/statfs.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif])
-# struct statvfs.f_basetype is available on Solaris but not for Linux. 
-AC_CHECK_MEMBERS([struct statvfs.f_basetype],,, [#include <sys/statvfs.h>])
-
-dnl
-dnl if statfs() takes 2 arguments (Posix) or 4 (Solaris)
-dnl
-if test "$ac_cv_func_statfs" = yes ; then
-  AC_MSG_CHECKING([number of arguments to statfs()])
-  AC_TRY_COMPILE([#include <unistd.h>
-  #ifdef HAVE_SYS_PARAM_H
-  #include <sys/param.h>
-  #endif
-  #ifdef HAVE_SYS_VFS_H
-  #include <sys/vfs.h>
-  #endif
-  #ifdef HAVE_SYS_MOUNT_H
-  #include <sys/mount.h>
-  #endif
-  #ifdef HAVE_SYS_STATFS_H
-  #include <sys/statfs.h>
-  #endif], [struct statfs st;
-  statfs(NULL, &st);],[
-    AC_MSG_RESULT([2])
-    AC_DEFINE(STATFS_ARGS, 2, [Number of arguments to statfs()])],[
-    AC_TRY_COMPILE([#include <unistd.h>
-  #ifdef HAVE_SYS_PARAM_H
-  #include <sys/param.h>
-  #endif
-  #ifdef HAVE_SYS_VFS_H
-  #include <sys/vfs.h>
-  #endif
-  #ifdef HAVE_SYS_MOUNT_H
-  #include <sys/mount.h>
-  #endif
-  #ifdef HAVE_SYS_STATFS_H
-  #include <sys/statfs.h>
-  #endif], [struct statfs st;
-  statfs(NULL, &st, sizeof (st), 0);],[
-      AC_MSG_RESULT([4])
-      AC_DEFINE(STATFS_ARGS, 4, [Number of arguments to statfs()])],[
-      AC_MSG_RESULT(unknown)
-      AC_MSG_ERROR([unable to determine number of arguments to statfs()])])])
-fi
-
-dnl ==========================================================================
-dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-
-AC_ARG_ENABLE(more-warnings,
-AS_HELP_STRING([--enable-more-warnings],[Maximum compiler warnings]),
-set_more_warnings="$enableval",[
-if test -f $srcdir/CVSVERSION; then
-	is_cvs_version=true
-	set_more_warnings=yes
-else
-	set_more_warnings=no
-fi
-])
-AC_MSG_CHECKING(for more warnings, including -Werror)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-	AC_MSG_RESULT(yes)
-	CFLAGS="\
-	-Wall \
-	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	-Wnested-externs -Wpointer-arith \
-	-Wcast-align -Wsign-compare \
-	$CFLAGS"
-
-	for option in -Wno-strict-aliasing -Wno-sign-compare -Wtype-limits; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		if test $has_option = no; then
-			CFLAGS="$SAVE_CFLAGS"
-		fi
-		AC_MSG_RESULT($has_option)
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_OUTPUT([
-Makefile
-common/Makefile
-client/Makefile
-metadata/Makefile
-daemon/trashlib/Makefile
-daemon/Makefile
-monitor/Makefile
-monitor/proxy/Makefile
-monitor/hal/Makefile
-monitor/gdu/Makefile
-monitor/udisks2/Makefile
-monitor/gphoto2/Makefile
-monitor/afc/Makefile
-programs/Makefile
-test/Makefile
-po/Makefile.in
-])
-
-echo 
-echo "gvfs configuration summary:"
-echo "
-        gio module directory : $giomodulesdir
-
-        hotplug backend:              $msg_hotplug_backend
-
-	Blu-ray metadata support:     $msg_bluray
-        FTP/HTTP/WebDAV support:      $msg_http
-        ObexFTP support               $msg_obexftp
-	Samba support:	              $msg_samba
-	FUSE support:                 $msg_fuse
-        CDDA support:                 $msg_cdda
-        Gphoto2 support:              $msg_gphoto2
-	archive support:              $msg_archive
-	AFC support:                  $msg_afc
-        AFP support:                  $msg_afp
-        DNS-SD support:               $msg_avahi
-	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
-	Build GDU volume monitor:     $msg_gdu
-	Build udisks2 volume monitor: $msg_udisks2
-        Use libsystemd-login:         $msg_libsystemd_login
-	GNOME Keyring support:        $msg_keyring
-	Bash-completion support:      $msg_bash_completion
-"
-
-# The gudev gphoto monitor needs a recent libgphoto; point to the required patch if the version is too old
-if test "x$msg_gudev" = "xyes"; then
-  PKG_CHECK_EXISTS(libgphoto2 >= 2.4.7,, msg_gphoto_patch=yes)
-  if test "x$msg_gphoto_patch" = "xyes"; then
-    AC_MSG_WARN([You are using a libgphoto2 version earlier than 2.4.7. To work with gudev, you must apply the patch in http://sourceforge.net/tracker/?func=detail&aid=2801117&group_id=8874&atid=308874])
-  fi
-fi
-

=== removed directory '.pc/03_xdg-mount.patch'
=== removed directory '.pc/03_xdg-mount.patch/monitor'
=== removed directory '.pc/03_xdg-mount.patch/monitor/hal'
=== removed file '.pc/03_xdg-mount.patch/monitor/hal/ghaldrive.c'
--- .pc/03_xdg-mount.patch/monitor/hal/ghaldrive.c	2010-05-02 18:16:31 +0000
+++ .pc/03_xdg-mount.patch/monitor/hal/ghaldrive.c	1970-01-01 00:00:00 +0000
@@ -1,959 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <[e-mail]>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include "ghalvolumemonitor.h"
-#include "ghaldrive.h"
-#include "ghalvolume.h"
-
-struct _GHalDrive {
-  GObject parent;
-
-  GVolumeMonitor  *volume_monitor; /* owned by volume monitor */
-  GList           *volumes;        /* entries in list are owned by volume_monitor */
-
-  char *name;
-  char *icon;
-  char *device_path;
-
-  gboolean can_eject;
-  gboolean can_poll_for_media;
-  gboolean is_media_check_automatic;
-  gboolean has_media;
-  gboolean uses_removable_media;
-
-  HalDevice *device;
-  HalPool *pool;
-};
-
-static void g_hal_drive_drive_iface_init (GDriveIface *iface);
-
-G_DEFINE_TYPE_EXTENDED (GHalDrive, g_hal_drive, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_DRIVE,
-                                               g_hal_drive_drive_iface_init))
-
-static void
-g_hal_drive_finalize (GObject *object)
-{
-  GList *l;
-  GHalDrive *drive;
-  
-  drive = G_HAL_DRIVE (object);
-
-  for (l = drive->volumes; l != NULL; l = l->next)
-    {
-      GHalVolume *volume = l->data;
-      g_hal_volume_unset_drive (volume, drive);
-    }
-
-  g_free (drive->device_path);
-  if (drive->device != NULL)
-    g_object_unref (drive->device);
-  if (drive->pool != NULL)
-    g_object_unref (drive->pool);
-
-  g_free (drive->name);
-  g_free (drive->icon);
-
-  if (drive->volume_monitor != NULL)
-    g_object_remove_weak_pointer (G_OBJECT (drive->volume_monitor), (gpointer) &(drive->volume_monitor));
-  
-  if (G_OBJECT_CLASS (g_hal_drive_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_hal_drive_parent_class)->finalize) (object);
-}
-
-static void
-g_hal_drive_class_init (GHalDriveClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = g_hal_drive_finalize;
-}
-
-static void
-g_hal_drive_init (GHalDrive *hal_drive)
-{
-}
-
-static char *
-_drive_get_description (HalDevice *d)
-{
-  char *s = NULL;
-  const char *drive_type;
-  const char *drive_bus;
-  const char *name_from_hal;
-
-  drive_type = hal_device_get_property_string (d, "storage.drive_type");
-  drive_bus = hal_device_get_property_string (d, "storage.bus");
-  name_from_hal = hal_device_get_property_string (d, "info.desktop.name");
-
-  
-  if (strlen (name_from_hal) > 0)
-    {
-      s = g_strdup (name_from_hal);
-    }
-  else if (strcmp (drive_type, "cdrom") == 0)
-    {
-      const char *first;
-      const char *second;
-      
-      first = _("CD-ROM");
-      if (hal_device_get_property_bool (d, "storage.cdrom.cdr"))
-        first = _("CD-R");
-      if (hal_device_get_property_bool (d, "storage.cdrom.cdrw"))
-        first = _("CD-RW");
-      
-      second = NULL;
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvd"))
-        second = _("DVD-ROM");
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvdplusr"))
-        second = _("DVD+R");
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvdplusrw"))
-        second = _("DVD+RW");
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvdr"))
-        second = _("DVD-R");
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvdrw"))
-        second = _("DVD-RW");
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvdram"))
-        second = _("DVD-RAM");
-      if ((hal_device_get_property_bool (d, "storage.cdrom.dvdr")) &&
-          (hal_device_get_property_bool (d, "storage.cdrom.dvdplusr")))
-        second = _("DVD\xc2\xb1R");
-      if (hal_device_get_property_bool (d, "storage.cdrom.dvdrw") &&
-          hal_device_get_property_bool (d, "storage.cdrom.dvdplusrw"))
-        second = _("DVD\xc2\xb1RW");
-      if (hal_device_get_property_bool (d, "storage.cdrom.hddvd"))
-        second = _("HDDVD");
-      if (hal_device_get_property_bool (d, "storage.cdrom.hddvdr"))
-        second = _("HDDVD-r");
-      if (hal_device_get_property_bool (d, "storage.cdrom.hddvdrw"))
-        second = _("HDDVD-RW");
-      if (hal_device_get_property_bool (d, "storage.cdrom.bd"))
-        second = _("Blu-ray");
-      if (hal_device_get_property_bool (d, "storage.cdrom.bdr"))
-        second = _("Blu-ray-R");
-      if (hal_device_get_property_bool (d, "storage.cdrom.bdre"))
-        second = _("Blu-ray-RE");
-      
-      if (second != NULL)
-        {
-          /* translators: This wis something like "CD-ROM/DVD Drive" or
-             "CD-RW/Blue-ray Drive" depending on the properties of the drive */
-          s = g_strdup_printf (_("%s/%s Drive"), first, second);
-        }
-      else
-        {
-          /* translators: This wis something like "CD-ROM Drive" or "CD-RW Drive
-             depending on the properties of the drive */
-          s = g_strdup_printf (_("%s Drive"), first);
-        }
-    } 
-  else if (strcmp (drive_type, "floppy") == 0)
-    s = g_strdup (_("Floppy Drive"));
-  else if (strcmp (drive_type, "disk") == 0)
-    {
-      if (drive_bus != NULL)
-        {
-          if (strcmp (drive_bus, "linux_raid") == 0)
-            s = g_strdup (_("Software RAID Drive"));
-          if (strcmp (drive_bus, "usb") == 0)
-            s = g_strdup (_("USB Drive"));
-          if (strcmp (drive_bus, "ide") == 0)
-            s = g_strdup (_("ATA Drive"));
-          if (strcmp (drive_bus, "scsi") == 0)
-            s = g_strdup (_("SCSI Drive"));
-          if (strcmp (drive_bus, "ieee1394") == 0)
-            s = g_strdup (_("FireWire Drive"));
-        } 
-    } 
-  else if (strcmp (drive_type, "tape") == 0)
-    s = g_strdup (_("Tape Drive"));
-  else if (strcmp (drive_type, "compact_flash") == 0)
-    s = g_strdup (_("CompactFlash Drive"));
-  else if (strcmp (drive_type, "memory_stick") == 0)
-    s = g_strdup (_("MemoryStick Drive"));
-  else if (strcmp (drive_type, "smart_media") == 0)
-    s = g_strdup (_("SmartMedia Drive"));
-  else if (strcmp (drive_type, "sd_mmc") == 0)
-    s = g_strdup (_("SD/MMC Drive"));
-  else if (strcmp (drive_type, "zip") == 0)
-    s = g_strdup (_("Zip Drive"));
-  else if (strcmp (drive_type, "jaz") == 0)
-    s = g_strdup (_("Jaz Drive"));
-  else if (strcmp (drive_type, "flashkey") == 0)
-    s = g_strdup (_("Thumb Drive"));
-
-  if (s == NULL)
-    s = g_strdup (_("Mass Storage Drive"));
-
-  return s;
-}
-
-char *
-_drive_get_icon (HalDevice *d)
-{
-  char *s = NULL;
-  const char *drive_type;
-  const char *drive_bus;
-  const char *icon_from_hal;
-  gboolean is_audio_player;
-
-  drive_type = hal_device_get_property_string (d, "storage.drive_type");
-  drive_bus = hal_device_get_property_string (d, "storage.bus");
-  is_audio_player = hal_device_has_capability (d, "portable_audio_player");
-  icon_from_hal = hal_device_get_property_string (d, "storage.icon.drive");
-
-  if (strlen (icon_from_hal) > 0)
-    s = g_strdup (icon_from_hal);
-  else if (is_audio_player)
-    s = g_strdup ("multimedia-player");
-  else if (strcmp (drive_type, "disk") == 0)
-    {
-      if (strcmp (drive_bus, "ide") == 0)
-        s = g_strdup ("drive-removable-media-ata");
-      else if (strcmp (drive_bus, "scsi") == 0)
-        s = g_strdup ("drive-removable-media-scsi");
-      else if (strcmp (drive_bus, "ieee1394") == 0)
-        s = g_strdup ("drive-removable-media-ieee1394");
-      else if (strcmp (drive_bus, "usb") == 0)
-        s = g_strdup ("drive-removable-media-usb");
-      else
-        s = g_strdup ("drive-removable-media");
-    }
-  else if (strcmp (drive_type, "cdrom") == 0)
-    {
-      /* TODO: maybe there's a better heuristic than this */
-      if (hal_device_get_property_int (d, "storage.cdrom.write_speed") > 0)
-        s = g_strdup ("drive-optical-recorder");
-      else
-        s = g_strdup ("drive-optical");
-    }
-  else if (strcmp (drive_type, "floppy") == 0)
-    s = g_strdup ("drive-removable-media-floppy");
-  else if (strcmp (drive_type, "tape") == 0)
-    s = g_strdup ("drive-removable-media-tape");
-  else if (strcmp (drive_type, "compact_flash") == 0)
-    s = g_strdup ("drive-removable-media-flash-cf");
-  else if (strcmp (drive_type, "memory_stick") == 0)
-    s = g_strdup ("drive-removable-media-flash-ms");
-  else if (strcmp (drive_type, "smart_media") == 0)
-    s = g_strdup ("drive-removable-media-flash-sm");
-  else if (strcmp (drive_type, "sd_mmc") == 0)
-    s = g_strdup ("drive-removable-media-flash-sd");
-
-  if (s == NULL)
-    s = g_strdup ("drive-removable-media");
-  
-  return s;
-}
-
-static void
-_do_update_from_hal (GHalDrive *d)
-{
-  d->name = _drive_get_description (d->device);
-  d->icon = _drive_get_icon (d->device);
-  
-  d->uses_removable_media = hal_device_get_property_bool (d->device, "storage.removable");
-  if (d->uses_removable_media)
-    {
-      d->has_media = hal_device_get_property_bool (d->device, "storage.removable.media_available");
-      d->is_media_check_automatic = hal_device_get_property_bool (d->device, "storage.media_check_enabled");
-      d->can_poll_for_media = hal_device_has_interface (d->device, "org.freedesktop.Hal.Device.Storage.Removable");
-      d->can_eject = hal_device_get_property_bool (d->device, "storage.requires_eject");
-    }
-  else
-    {
-      d->has_media = TRUE;
-      d->is_media_check_automatic = FALSE;
-      d->can_poll_for_media = FALSE;
-      d->can_eject = FALSE;
-    }
-}
-
-static void
-emit_drive_changed (GHalDrive *drive)
-{
-  g_signal_emit_by_name (drive, "changed");
-  if (drive->volume_monitor != NULL)
-    g_signal_emit_by_name (drive->volume_monitor, "drive_changed", drive);
-}
-
-static void
-_update_from_hal (GHalDrive *d, gboolean emit_changed)
-{
-  char *old_name;
-  char *old_icon;
-  gboolean old_uses_removable_media;
-  gboolean old_has_media;
-  gboolean old_is_media_check_automatic;
-  gboolean old_can_poll_for_media;
-  gboolean old_can_eject;
-
-  old_name = g_strdup (d->name);
-  old_icon = g_strdup (d->icon);
-  old_uses_removable_media = d->uses_removable_media;
-  old_has_media = d->has_media;
-  old_is_media_check_automatic = d->is_media_check_automatic;
-  old_can_poll_for_media = d->can_poll_for_media;
-  old_can_eject = d->can_eject;
-
-  g_free (d->name);
-  g_free (d->icon);
-  _do_update_from_hal (d);
-
-  if (emit_changed &&
-      (old_uses_removable_media != d->uses_removable_media ||
-       old_has_media != d->has_media ||
-       old_is_media_check_automatic != d->is_media_check_automatic ||
-       old_can_poll_for_media != d->can_poll_for_media ||
-       old_can_eject != d->can_eject ||
-       old_name == NULL || 
-       old_icon == NULL ||
-       strcmp (old_name, d->name) != 0 ||
-       strcmp (old_icon, d->icon) != 0))
-    emit_drive_changed (d);
-  
-  g_free (old_name);
-  g_free (old_icon);
-}
-
-static void
-hal_condition (HalDevice *device, const char *name, const char *detail, gpointer user_data)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (user_data);
-
-  if (strcmp (name, "EjectPressed") == 0)
-    {
-      g_signal_emit_by_name (hal_drive, "eject-button");
-      if (hal_drive->volume_monitor != NULL)
-        g_signal_emit_by_name (hal_drive->volume_monitor, "drive-eject-button", hal_drive);
-    }
-
-}
-
-static void
-hal_changed (HalDevice *device, const char *key, gpointer user_data)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (user_data);
-  
-  /*g_warning ("volhal modifying %s (property %s changed)", hal_drive->device_path, key);*/
-  _update_from_hal (hal_drive, TRUE);
-}
-
-GHalDrive *
-g_hal_drive_new (GVolumeMonitor       *volume_monitor,
-                 HalDevice            *device,
-                 HalPool              *pool)
-{
-  GHalDrive *drive;
-
-  drive = g_object_new (G_TYPE_HAL_DRIVE, NULL);
-  drive->volume_monitor = volume_monitor;
-  g_object_add_weak_pointer (G_OBJECT (volume_monitor), (gpointer) &(drive->volume_monitor));
-  drive->device_path = g_strdup (hal_device_get_property_string (device, "block.device"));
-  drive->device = g_object_ref (device);
-  drive->pool = g_object_ref (pool);
-
-  drive->name = g_strdup_printf ("Drive for %s", drive->device_path);
-  drive->icon = g_strdup_printf ("drive-removable-media");
-
-  g_signal_connect_object (device, "hal_property_changed", (GCallback) hal_changed, drive, 0);
-  g_signal_connect_object (device, "hal_condition", (GCallback) hal_condition, drive, 0);
-
-  _update_from_hal (drive, FALSE);
-
-  return drive;
-}
-
-void 
-g_hal_drive_disconnected (GHalDrive *drive)
-{
-  GList *l, *volumes;
-
-  volumes = drive->volumes;
-  drive->volumes = NULL;
-  
-  for (l = volumes; l != NULL; l = l->next)
-    {
-      GHalVolume *volume = l->data;
-      g_hal_volume_unset_drive (volume, drive);
-    }
-
-  g_list_free (volumes);
-}
-
-void 
-g_hal_drive_set_volume (GHalDrive *drive, 
-                        GHalVolume *volume)
-{
-
-  if (g_list_find (drive->volumes, volume) == NULL)
-    {
-      drive->volumes = g_list_prepend (drive->volumes, volume);
-      emit_drive_changed (drive);
-    }
-}
-
-void 
-g_hal_drive_unset_volume (GHalDrive *drive, 
-                          GHalVolume *volume)
-{
-  GList *l;
-
-  l = g_list_find (drive->volumes, volume);
-  if (l != NULL)
-    {
-      drive->volumes = g_list_delete_link (drive->volumes, l);
-
-      emit_drive_changed (drive);
-    }
-}
-
-gboolean 
-g_hal_drive_has_udi (GHalDrive *drive, const char *udi)
-{
-  gboolean res;
-  
-  res = strcmp (udi, hal_device_get_udi (drive->device)) == 0;
-
-  return res;
-}
-
-static GIcon *
-g_hal_drive_get_icon (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  GIcon *icon;
-
-  icon = g_themed_icon_new_with_default_fallbacks (hal_drive->icon);
-  
-  return icon; 
-}
-
-static char *
-g_hal_drive_get_name (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  char *name;
-
-  name = g_strdup (hal_drive->name);
-  
-  return name;
-}
-
-static GList *
-g_hal_drive_get_volumes (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  GList *l;
-
-  l = g_list_copy (hal_drive->volumes);
-  g_list_foreach (l, (GFunc) g_object_ref, NULL);
-
-  return l;
-}
-
-static gboolean
-g_hal_drive_has_volumes (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-
-  return hal_drive->volumes != NULL;
-}
-
-static gboolean
-g_hal_drive_is_media_removable (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-
-  return hal_drive->uses_removable_media;
-}
-
-static gboolean
-g_hal_drive_has_media (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-
-  return hal_drive->has_media;
-}
-
-static gboolean
-g_hal_drive_is_media_check_automatic (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-
-  return hal_drive->is_media_check_automatic;
-}
-
-static gboolean
-g_hal_drive_can_eject (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  
-  return hal_drive->can_eject;
-}
-
-static gboolean
-g_hal_drive_can_poll_for_media (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  
-  return hal_drive->can_poll_for_media;
-}
-
-typedef struct {
-  GObject *object;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-  GCancellable *cancellable;
-} SpawnOp;
-
-static void 
-spawn_cb (GPid pid, gint status, gpointer user_data)
-{
-  SpawnOp *data = user_data;
-  GSimpleAsyncResult *simple;
-
-
-  if (WEXITSTATUS (status) != 0)
-    {
-      GError *error;
-      error = g_error_new_literal (G_IO_ERROR, 
-                                   G_IO_ERROR_FAILED_HANDLED,
-                                   "You are not supposed to show G_IO_ERROR_FAILED_HANDLED in the UI");
-      simple = g_simple_async_result_new_from_error (data->object,
-                                                     data->callback,
-                                                     data->user_data,
-                                                     error);
-      g_error_free (error);
-    }
-  else
-    {
-      simple = g_simple_async_result_new (data->object,
-                                          data->callback,
-                                          data->user_data,
-                                          NULL);
-    }
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-  g_object_unref (data->object);
-  g_free (data);
-}
-
-static void
-g_hal_drive_eject_do (GDrive              *drive,
-                      GCancellable        *cancellable,
-                      GAsyncReadyCallback  callback,
-                      gpointer             user_data)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  SpawnOp *data;
-  GPid child_pid;
-  GError *error;
-  char *argv[] = {"gnome-mount", "-e", "-b", "-d", NULL, NULL};
-
-  argv[4] = g_strdup (hal_drive->device_path);
-  
-  data = g_new0 (SpawnOp, 1);
-  data->object = g_object_ref (drive);
-  data->callback = callback;
-  data->user_data = user_data;
-  data->cancellable = cancellable;
-
-  error = NULL;
-  if (!g_spawn_async (NULL,         /* working dir */
-                      argv,
-                      NULL,         /* envp */
-                      G_SPAWN_DO_NOT_REAP_CHILD|G_SPAWN_SEARCH_PATH,
-                      NULL,         /* child_setup */
-                      NULL,         /* user_data for child_setup */
-                      &child_pid,
-                      &error))
-    {
-      GSimpleAsyncResult *simple;
-
-      simple = g_simple_async_result_new_from_error (data->object,
-                                                     data->callback,
-                                                     data->user_data,
-                                                     error);
-      g_simple_async_result_complete (simple);
-      g_object_unref (simple);
-      g_object_unref (drive);
-      g_error_free (error);
-      g_free (data);
-    }
-  else
-    g_child_watch_add (child_pid, spawn_cb, data);
-
-  g_free (argv[4]);
-}
-
-
-typedef struct {
-  GDrive *drive;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-  GMountOperation *mount_operation;
-  GCancellable *cancellable;
-  GMountUnmountFlags flags;
-
-  GList *pending_mounts;
-} UnmountMountsOp;
-
-static void
-free_unmount_mounts_op (UnmountMountsOp *data)
-{
-  GList *l;
-
-  for (l = data->pending_mounts; l != NULL; l = l->next)
-    {
-      GMount *mount = l->data;
-      g_object_unref (mount);
-    }
-  g_list_free (data->pending_mounts);
-}
-
-static void _eject_unmount_mounts (UnmountMountsOp *data);
-
-static void
-_eject_unmount_mounts_cb (GObject *source_object,
-                          GAsyncResult *res,
-                          gpointer user_data)
-{
-  UnmountMountsOp *data = user_data;
-  GMount *mount = G_MOUNT (source_object);
-  GSimpleAsyncResult *simple;
-  GError *error = NULL;
-
-  if (!g_mount_unmount_with_operation_finish (mount, res, &error))
-    {
-      /* make the error dialog more targeted to the drive.. unless the user has already seen a dialog */
-      if (error->code != G_IO_ERROR_FAILED_HANDLED)
-        {
-          g_error_free (error);
-          error = g_error_new (G_IO_ERROR, G_IO_ERROR_BUSY,
-                               _("Failed to eject media; one or more volumes on the media are busy."));
-        }
-
-      /* unmount failed; need to fail the whole eject operation */
-      simple = g_simple_async_result_new_from_error (G_OBJECT (data->drive),
-                                                     data->callback,
-                                                     data->user_data,
-                                                     error);
-      g_error_free (error);
-      g_simple_async_result_complete (simple);
-      g_object_unref (simple);
-
-      free_unmount_mounts_op (data);
-    }
-  else
-    {
-
-      /*g_warning ("successfully unmounted %p", mount);*/
-
-      /* move on to the next mount.. */
-      _eject_unmount_mounts (data);
-    }
-
-  g_object_unref (mount);
-}
-
-static void
-_eject_unmount_mounts (UnmountMountsOp *data)
-{
-  GMount *mount;
-
-  if (data->pending_mounts == NULL)
-    {
-
-      /*g_warning ("all pending mounts done; ejecting drive");*/
-
-      g_hal_drive_eject_do (data->drive,
-                            data->cancellable,
-                            data->callback,
-                            data->user_data);
-
-      g_object_unref (data->drive);
-      g_free (data);
-    }
-  else
-    {
-      mount = data->pending_mounts->data;
-      data->pending_mounts = g_list_remove (data->pending_mounts, mount);
-
-      /*g_warning ("unmounting %p", mount);*/
-
-      g_mount_unmount_with_operation (mount,
-                                      data->flags,
-                                      data->mount_operation,
-                                      data->cancellable,
-                                      _eject_unmount_mounts_cb,
-                                      data);
-    }
-}
-
-static void
-g_hal_drive_eject_with_operation (GDrive              *drive,
-                                  GMountUnmountFlags   flags,
-                                  GMountOperation     *mount_operation,
-                                  GCancellable        *cancellable,
-                                  GAsyncReadyCallback  callback,
-                                  gpointer             user_data)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  UnmountMountsOp *data;
-  GList *l;
-
-  /* first we need to go through all the volumes and unmount their assoicated mounts (if any) */
-
-  data = g_new0 (UnmountMountsOp, 1);
-  data->drive = g_object_ref (drive);
-  data->mount_operation = mount_operation;
-  data->cancellable = cancellable;
-  data->callback = callback;
-  data->user_data = user_data;
-  data->flags = flags;
-
-  for (l = hal_drive->volumes; l != NULL; l = l->next)
-    {
-      GHalVolume *volume = l->data;
-      GMount *mount; /* the mount may be foreign; cannot assume GHalMount */
-
-      mount = g_volume_get_mount (G_VOLUME (volume));
-      if (mount != NULL && g_mount_can_unmount (mount))
-        data->pending_mounts = g_list_prepend (data->pending_mounts, g_object_ref (mount));
-    }
-
-  _eject_unmount_mounts (data);
-}
-
-static gboolean
-g_hal_drive_eject_with_operation_finish (GDrive        *drive,
-                                         GAsyncResult  *result,
-                                         GError       **error)
-{
-  return TRUE;
-}
-
-static void
-g_hal_drive_eject (GDrive              *drive,
-                   GMountUnmountFlags   flags,
-                   GCancellable        *cancellable,
-                   GAsyncReadyCallback  callback,
-                   gpointer             user_data)
-{
-  g_hal_drive_eject (drive, flags, cancellable, callback, user_data);
-}
-
-static gboolean
-g_hal_drive_eject_finish (GDrive        *drive,
-                          GAsyncResult  *result,
-                          GError       **error)
-{
-  return g_hal_drive_eject_with_operation_finish (drive, result, error);
-}
-
-typedef struct {
-  GObject *object;
-  GAsyncReadyCallback callback;
-  gpointer user_data;
-  GCancellable *cancellable;
-} PollOp;
-
-static void
-poll_for_media_cb (DBusPendingCall *pending_call, void *user_data)
-{
-  PollOp *data = (PollOp *) user_data;
-  GSimpleAsyncResult *simple;
-  DBusMessage *reply;
-
-  reply = dbus_pending_call_steal_reply (pending_call);
-
-  if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
-    {
-      GError *error;
-      DBusError dbus_error;
-
-      dbus_error_init (&dbus_error);
-      dbus_set_error_from_message (&dbus_error, reply);
-      error = g_error_new (G_IO_ERROR,
-                           G_IO_ERROR_FAILED,
-                           "Cannot invoke CheckForMedia on HAL: %s: %s", dbus_error.name, dbus_error.message);
-      simple = g_simple_async_result_new_from_error (data->object,
-                                                     data->callback,
-                                                     data->user_data,
-                                                     error);
-      g_simple_async_result_complete (simple);
-      g_object_unref (simple);
-      g_error_free (error);
-      dbus_error_free (&dbus_error);
-      goto out;
-    }
-
-  /* TODO: parse reply and extract result?
-   * (the result is whether the media availability state changed)
-   */
-
-  simple = g_simple_async_result_new (data->object,
-                                      data->callback,
-                                      data->user_data,
-                                      NULL);
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-
- out:
-  g_object_unref (data->object);
-  dbus_message_unref (reply);
-  dbus_pending_call_unref (pending_call);
-}
-
-
-static void
-g_hal_drive_poll_for_media (GDrive              *drive,
-                            GCancellable        *cancellable,
-                            GAsyncReadyCallback  callback,
-                            gpointer             user_data)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  DBusConnection *con;
-  DBusMessage *msg;
-  DBusPendingCall *pending_call;
-  PollOp *data;
-
-  data = g_new0 (PollOp, 1);
-  data->object = g_object_ref (drive);
-  data->callback = callback;
-  data->user_data = user_data;
-  data->cancellable = cancellable;
-
-  /*g_warning ("Rescanning udi %s", hal_device_get_udi (hal_drive->device));*/
-
-  con = hal_pool_get_dbus_connection (hal_drive->pool);
-  msg = dbus_message_new_method_call ("org.freedesktop.Hal",
-                                      hal_device_get_udi (hal_drive->device),
-                                      "org.freedesktop.Hal.Device.Storage.Removable",
-                                      "CheckForMedia");
-
-  if (!dbus_connection_send_with_reply (con, msg, &pending_call, -1))
-    {
-      GError *error;
-      GSimpleAsyncResult *simple;
-      error = g_error_new_literal (G_IO_ERROR,
-                                   G_IO_ERROR_FAILED,
-                                   "Cannot invoke CheckForMedia on HAL");
-      simple = g_simple_async_result_new_from_error (data->object,
-                                                     data->callback,
-                                                     data->user_data,
-                                                     error);
-      g_simple_async_result_complete (simple);
-      g_object_unref (simple);
-      g_error_free (error);
-      g_object_unref (data->object);
-      g_free (data);
-    }
-  else
-    dbus_pending_call_set_notify (pending_call,
-                                  poll_for_media_cb,
-                                  data,
-                                  (DBusFreeFunction) g_free);
-
-  dbus_message_unref (msg);
-}
-
-static gboolean
-g_hal_drive_poll_for_media_finish (GDrive        *drive,
-                                   GAsyncResult  *result,
-                                   GError       **error)
-{
-  /*g_warning ("poll finish");*/
-  return TRUE;
-}
-
-static char *
-g_hal_drive_get_identifier (GDrive              *drive,
-                             const char          *kind)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  char *res;
-
-  res = NULL;
-
-  if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_HAL_UDI) == 0)
-    res = g_strdup (hal_device_get_udi (hal_drive->device));
-  
-  if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
-    res = g_strdup (hal_drive->device_path);
-  
-  return res;
-}
-
-static char **
-g_hal_drive_enumerate_identifiers (GDrive *drive)
-{
-  GHalDrive *hal_drive = G_HAL_DRIVE (drive);
-  GPtrArray *res;
-
-  res = g_ptr_array_new ();
-
-  g_ptr_array_add (res,
-                   g_strdup (G_VOLUME_IDENTIFIER_KIND_HAL_UDI));
-
-  if (hal_drive->device_path && *hal_drive->device_path != 0)
-    g_ptr_array_add (res,
-                     g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
-    
-  
-  /* Null-terminate */
-  g_ptr_array_add (res, NULL);
-  
-  return (char **)g_ptr_array_free (res, FALSE);
-}
-
-static void
-g_hal_drive_drive_iface_init (GDriveIface *iface)
-{
-  iface->get_name = g_hal_drive_get_name;
-  iface->get_icon = g_hal_drive_get_icon;
-  iface->has_volumes = g_hal_drive_has_volumes;
-  iface->get_volumes = g_hal_drive_get_volumes;
-  iface->is_media_removable = g_hal_drive_is_media_removable;
-  iface->has_media = g_hal_drive_has_media;
-  iface->is_media_check_automatic = g_hal_drive_is_media_check_automatic;
-  iface->can_eject = g_hal_drive_can_eject;
-  iface->can_poll_for_media = g_hal_drive_can_poll_for_media;
-  iface->eject = g_hal_drive_eject;
-  iface->eject_finish = g_hal_drive_eject_finish;
-  iface->eject_with_operation = g_hal_drive_eject_with_operation;
-  iface->eject_with_operation_finish = g_hal_drive_eject_with_operation_finish;
-  iface->poll_for_media = g_hal_drive_poll_for_media;
-  iface->poll_for_media_finish = g_hal_drive_poll_for_media_finish;
-  iface->get_identifier = g_hal_drive_get_identifier;
-  iface->enumerate_identifiers = g_hal_drive_enumerate_identifiers;
-}

=== removed file '.pc/03_xdg-mount.patch/monitor/hal/ghalmount.c'
--- .pc/03_xdg-mount.patch/monitor/hal/ghalmount.c	2011-11-17 07:43:33 +0000
+++ .pc/03_xdg-mount.patch/monitor/hal/ghalmount.c	1970-01-01 00:00:00 +0000
@@ -1,1192 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* GIO - GLib Input, Output and Streaming Library
- * 
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Zeuthen <[e-mail]>
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gio/gio.h>
-
-#include <gvfsmountinfo.h>
-
-#include "ghalvolumemonitor.h"
-#include "ghalmount.h"
-#include "ghalvolume.h"
-
-#include "hal-utils.h"
-
-struct _GHalMount {
-  GObject parent;
-
-  GVolumeMonitor *volume_monitor; /* owned by volume monitor */
-  GHalVolume *volume;             /* owned by volume monitor */
-
-  char *name;
-  GIcon *icon;
-  char *device_path;
-  char *mount_path;
-
-  char *uuid;
-
-  char *override_name;
-  GIcon *override_icon;
-  GFile *override_root;
-  gboolean cannot_unmount;
-
-  HalDevice *device;
-  HalDevice *drive_device;
-
-  GIcon *autorun_icon;
-  gboolean searched_for_autorun;
-
-  gchar *xdg_volume_info_name;
-  GIcon *xdg_volume_info_icon;
-  gboolean searched_for_xdg_volume_info;
-};
-
-static GFile *get_root (GHalMount *hal_mount);
-
-static void update_from_hal (GHalMount *m, gboolean emit_changed);
-
-static void g_hal_mount_mount_iface_init (GMountIface *iface);
-
-G_DEFINE_TYPE_EXTENDED (GHalMount, g_hal_mount, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (G_TYPE_MOUNT,
-                                               g_hal_mount_mount_iface_init))
-
-static void
-g_hal_mount_finalize (GObject *object)
-{
-  GHalMount *mount;
-  
-  mount = G_HAL_MOUNT (object);
-
-  if (mount->volume != NULL)
-    g_hal_volume_unset_mount (mount->volume, mount);
-
-  g_free (mount->device_path);
-  g_free (mount->mount_path);
-  g_free (mount->uuid);
-
-  if (mount->device != NULL)
-    g_object_unref (mount->device);
-  if (mount->drive_device != NULL)
-    g_object_unref (mount->drive_device);
-
-  g_free (mount->name);
-  if (mount->icon != NULL)
-    g_object_unref (mount->icon);
-
-  g_free (mount->override_name);
-  if (mount->override_icon != NULL)
-    g_object_unref (mount->override_icon);
-
-  if (mount->override_root != NULL)
-    g_object_unref (mount->override_root);
-
-  if (mount->autorun_icon != NULL)
-    g_object_unref (mount->autorun_icon);
-
-  g_free (mount->xdg_volume_info_name);
-  if (mount->xdg_volume_info_icon != NULL)
-    g_object_unref (mount->xdg_volume_info_icon);
-
-  if (mount->volume_monitor != NULL)
-    g_object_remove_weak_pointer (G_OBJECT (mount->volume_monitor), (gpointer) &(mount->volume_monitor));
-  
-  if (G_OBJECT_CLASS (g_hal_mount_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_hal_mount_parent_class)->finalize) (object);
-}
-
-static void
-g_hal_mount_class_init (GHalMountClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = g_hal_mount_finalize;
-}
-
-static void
-g_hal_mount_init (GHalMount *hal_mount)
-{
-}
-
-static void
-emit_mount_changed (GHalMount *mount)
-{
-  g_signal_emit_by_name (mount, "changed");
-  if (mount->volume_monitor != NULL)
-    g_signal_emit_by_name (mount->volume_monitor, "mount_changed", mount);
-}
-
-#define KILOBYTE_FACTOR 1000.0
-#define MEGABYTE_FACTOR (1000.0 * 1000.0)
-#define GIGABYTE_FACTOR (1000.0 * 1000.0 * 1000.0)
-
-static char *
-format_size_for_display (guint64 size)
-{
-  char *str;
-  gdouble displayed_size;
-  
-  if (size < MEGABYTE_FACTOR)
-    {
-      displayed_size = (double) size / KILOBYTE_FACTOR;
-      str = g_strdup_printf (_("%.1f kB"), displayed_size);
-    } 
-  else if (size < GIGABYTE_FACTOR)
-    {
-      displayed_size = (double) size / MEGABYTE_FACTOR;
-      str = g_strdup_printf (_("%.1f MB"), displayed_size);
-    } 
-  else 
-    {
-      displayed_size = (double) size / GIGABYTE_FACTOR;
-      str = g_strdup_printf (_("%.1f GB"), displayed_size);
-    }
-  
-  return str;
-}
-
-static void
-got_autorun_info_cb (GObject      *source_object,
-                     GAsyncResult *res,
-                     gpointer      user_data)
-{
-  GHalMount *mount = G_HAL_MOUNT (user_data);
-
-  mount->autorun_icon = g_vfs_mount_info_query_autorun_info_finish (G_FILE (source_object),
-                                                                    res,
-                                                                    NULL);
-
-  update_from_hal (mount, TRUE);
-
-  g_object_unref (mount);
-}
-
-static void
-got_xdg_volume_info_cb (GObject      *source_object,
-                        GAsyncResult *res,
-                        gpointer      user_data)
-{
-  GHalMount *mount = G_HAL_MOUNT (user_data);
-
-  mount->xdg_volume_info_icon = g_vfs_mount_info_query_xdg_volume_info_finish (G_FILE (source_object),
-                                                                               res,
-                                                                               &(mount->xdg_volume_info_name),
-                                                                               NULL);
-  update_from_hal (mount, TRUE);
-
-  g_object_unref (mount);
-}
-
-static void
-do_update_from_hal (GHalMount *m)
-{
-  HalDevice *volume;
-  HalDevice *drive;
-  char *name;
-  const char *icon_name;
-  const char *icon_name_fallback;
-  const char *drive_type;
-  const char *drive_bus;
-  gboolean drive_uses_removable_media;
-  const char *volume_fs_label;
-  guint64 volume_size;
-  gboolean volume_is_disc;
-  gboolean volume_disc_has_audio;
-  gboolean volume_disc_has_data;
-  const char *volume_disc_type;
-  gboolean volume_disc_is_blank;
-  gboolean is_audio_player;
-  const char *icon_from_hal;
-  const char *volume_icon_from_hal;
-  const char *name_from_hal;
-  const char *volume_name_from_hal;
-  gboolean is_crypto;
-  gboolean is_crypto_cleartext;
-
-  volume = m->device;
-  drive = m->drive_device;
-  
-  drive_type = hal_device_get_property_string (drive, "storage.drive_type");
-  drive_bus = hal_device_get_property_string (drive, "storage.bus");
-  drive_uses_removable_media = hal_device_get_property_bool (drive, "storage.removable");
-  volume_fs_label = hal_device_get_property_string (volume, "volume.label");
-  volume_size = hal_device_get_property_uint64 (volume, "volume.size");
-  volume_is_disc = hal_device_get_property_bool (volume, "volume.is_disc");
-  volume_disc_has_audio = hal_device_get_property_bool (volume, "volume.disc.has_audio");
-  volume_disc_has_data = hal_device_get_property_bool (volume, "volume.disc.has_data");
-  volume_disc_is_blank = hal_device_get_property_bool (volume, "volume.disc.is_blank");
-  volume_disc_type = hal_device_get_property_string (volume, "volume.disc.type");
-  is_audio_player = hal_device_has_capability (drive, "portable_audio_player");
-  icon_from_hal = hal_device_get_property_string (drive, "storage.icon.drive");
-  volume_icon_from_hal = hal_device_get_property_string (volume, "storage.icon.volume");
-  name_from_hal = hal_device_get_property_string (drive, "info.desktop.name");