[gnome-applets] Remove deprecated GLIB symbols

[Javier Jardón <jjardon src gnome org>]

commit 921aa942fd26c505c767b3eb896b971ce59ada4d
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Dec 21 01:19:14 2009 +0100

    Remove deprecated GLIB symbols
    
    Substitude g_mount_eject(), g_volume_eject() and g_mount_unmount().
    Also, the new required GLIB version is 2.22.
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=605098

 configure.in              |    2 +-
 drivemount/drive-button.c |   20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/configure.in b/configure.in
index df9007d..035ecd5 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ dnl ***************************************************************************
 dnl *** Minimum library versions for GNOME-APPLETS                          ***
 dnl ***************************************************************************
 GTK_REQUIRED=2.13.0
-GLIB_REQUIRED=2.18.0
+GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
 GCONF_REQUIRED=2.8.0
 SCROLLKEEPER_REQUIRED=0.1.4
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index 9100ac2..65503e6 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -768,13 +768,13 @@ unmount_drive (DriveButton *self, GtkWidget *item)
 	mount = g_volume_get_mount (self->volume);
 	if (mount)
 	{
-	    g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE,
-			     NULL, NULL, NULL);
+	    g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE,
+	                                    NULL, NULL, NULL, NULL);
 	    g_object_unref (mount);
 	}
     } else if (self->mount) {
-	g_mount_unmount (self->mount, G_MOUNT_UNMOUNT_NONE,
-			 NULL, NULL, NULL);
+	g_mount_unmount_with_operation (self->mount, G_MOUNT_UNMOUNT_NONE,
+			                NULL, NULL, NULL, NULL);
     } else {
 	g_return_if_reached();
     }
@@ -791,11 +791,15 @@ static void
 eject_drive (DriveButton *self, GtkWidget *item)
 {
     if (self->volume) {
-	g_volume_eject (self->volume, G_MOUNT_UNMOUNT_NONE,
-			NULL,(GAsyncReadyCallback) eject_finish, NULL);
+	g_volume_eject_with_operation (self->volume, G_MOUNT_UNMOUNT_NONE,
+	                               NULL, NULL,
+	                               (GAsyncReadyCallback) eject_finish,
+	                               NULL);
     } else if (self->mount) {
-	g_mount_eject (self->mount, G_MOUNT_UNMOUNT_NONE,
-		       NULL, (GAsyncReadyCallback) eject_finish, NULL);
+	g_mount_eject_with_operation (self->mount, G_MOUNT_UNMOUNT_NONE,
+	                              NULL, NULL,
+	                              (GAsyncReadyCallback) eject_finish,
+	                              NULL);
     } else {
 	g_return_if_reached();
     }