[Xfce4-commits] <gigolo:master> Don't use deprecated GIO API

[Enrico Tröger]

Updating branch refs/heads/master
         to eb0479f4910488867007c79b6d7bd56da7c7d1b2 (commit)
       from 29b14fe406065f1037effd849d0d7e2c5cc8c7df (commit)

commit eb0479f4910488867007c79b6d7bd56da7c7d1b2
Author: Enrico Tröger <enrico at xfce.org>
Date:   Sun Oct 4 20:55:39 2009 +0200

    Don't use deprecated GIO API

 src/backendgvfs.c |   17 ++++++++++++++++-
 src/backendgvfs.h |    2 +-
 src/window.c      |    2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index 59294f1..75b5cbe 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -429,7 +429,11 @@ static void unmount_finished_cb(GObject *src, GAsyncResult *res, gpointer backen
 {
 	GError *error = NULL;
 
+#if GLIB_CHECK_VERSION(2, 22, 0)
+	if (! g_mount_unmount_with_operation_finish(G_MOUNT(src), res, &error))
+#else
 	if (! g_mount_unmount_finish(G_MOUNT(src), res, &error))
+#endif
 	{
 		gchar *name, *msg;
 
@@ -469,12 +473,23 @@ gboolean gigolo_backend_gvfs_mount_volume(GigoloBackendGVFS *backend, gpointer v
 }
 
 
-void gigolo_backend_gvfs_unmount_mount(GigoloBackendGVFS *backend, gpointer mount)
+void gigolo_backend_gvfs_unmount_mount(GigoloBackendGVFS *backend, gpointer mount, GtkWindow *parent)
 {
+#if GLIB_CHECK_VERSION(2, 22, 0)
+	GMountOperation *op;
+#endif
+
 	g_return_if_fail(backend != NULL);
 	g_return_if_fail(mount != NULL);
 
+#if GLIB_CHECK_VERSION(2, 22, 0)
+	op = gigolo_mount_operation_new(parent);
+	g_mount_unmount_with_operation(
+		G_MOUNT(mount), G_MOUNT_UNMOUNT_NONE, op, NULL, unmount_finished_cb, backend);
+	g_object_unref(op);
+#else
 	g_mount_unmount(G_MOUNT(mount), G_MOUNT_UNMOUNT_NONE, NULL, unmount_finished_cb, backend);
+#endif
 }
 
 
diff --git a/src/backendgvfs.h b/src/backendgvfs.h
index 8375eb9..c949a33 100644
--- a/src/backendgvfs.h
+++ b/src/backendgvfs.h
@@ -92,7 +92,7 @@ gboolean			gigolo_backend_gvfs_is_mount					(gpointer mount);
 void				gigolo_backend_gvfs_get_name_and_uri_from_mount	(gpointer mount, gchar **name, gchar **uri);
 
 gboolean			gigolo_backend_gvfs_mount_volume				(GigoloBackendGVFS *backend, gpointer vol);
-void				gigolo_backend_gvfs_unmount_mount				(GigoloBackendGVFS *backend, gpointer mount);
+void				gigolo_backend_gvfs_unmount_mount				(GigoloBackendGVFS *backend, gpointer mount, GtkWindow *parent);
 
 void				gigolo_backend_gvfs_mount_uri					(GigoloBackendGVFS *backend,
 																	 const gchar *uri,
diff --git a/src/window.c b/src/window.c
index ea1f1dc..ac0b2ea 100644
--- a/src/window.c
+++ b/src/window.c
@@ -404,7 +404,7 @@ static void action_unmount_cb(G_GNUC_UNUSED GtkAction *action, GigoloWindow *win
 			}
 			g_free(uri);
 
-			gigolo_backend_gvfs_unmount_mount(priv->backend_gvfs, mnt);
+			gigolo_backend_gvfs_unmount_mount(priv->backend_gvfs, mnt, GTK_WINDOW(window));
 		}
 	}
 }