Update mounting APIs

Original git commit by Alexander Larsson <alexl@redhat.com> at 1178202740 +0200

svn path=/trunk/; revision=502

1 files changed, 9 insertions, 5 deletions

diff --git a/programs/gvfs-mount.c b/programs/gvfs-mount.c
index 9d01655c..7a4539b7 100644
--- a/programs/gvfs-mount.c
+++ b/programs/gvfs-mount.c
@@ -74,10 +74,15 @@ ask_password_cb (GMountOperation *op,
 }
 
 static void
-mount_done_cb (GMountOperation *op,
-	       gboolean         succeeded,
-	       GError          *error)
+mount_done_cb (GObject *vfs,
+	       GAsyncResult *res,
+	       gpointer user_data)
 {
+  gboolean succeeded;
+  GError *error = NULL;
+
+  succeeded = g_mount_for_location_finish (res, &error);
+
   if (!succeeded)
     g_print ("Error mounting location: %s\n", error->message);
   
@@ -98,9 +103,8 @@ mount (GFile *file)
   op = g_mount_operation_new ();
 
   g_signal_connect (op, "ask_password", (GCallback)ask_password_cb, NULL);
-  g_signal_connect (op, "done", (GCallback)mount_done_cb, NULL);
   
-  g_file_mount (file, op);
+  g_mount_for_location (file, op, mount_done_cb, op);
   outstanding_mounts++;
 }