gnome-applets r10981 - trunk/drivemount

[callum svn gnome org]

Author: callum
Date: Sat Sep 13 03:52:26 2008
New Revision: 10981
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10981&view=rev

Log:
Avoid a crash on eject by
supplying a callback. Bug 551669. This seems to be a work-around
for a glib error.

Modified:
   trunk/drivemount/ChangeLog
   trunk/drivemount/drive-button.c

Modified: trunk/drivemount/drive-button.c
==============================================================================
--- trunk/drivemount/drive-button.c	(original)
+++ trunk/drivemount/drive-button.c	Sat Sep 13 03:52:26 2008
@@ -753,15 +753,23 @@
 	g_return_if_reached();
     }
 }
+
+static void eject_finish (DriveButton *self, GAsyncResult *res,
+			  gpointer user_data)
+{
+    /* Do nothing. We shouldn't need this according to the GIO
+     * docs, but the applet crashes without it using glib 2.18.0 */
+}
+
 static void
 eject_drive (DriveButton *self, GtkWidget *item)
 {
     if (self->volume) {
 	g_volume_eject (self->volume, G_MOUNT_UNMOUNT_NONE,
-			NULL, NULL, NULL);
+			NULL, eject_finish, NULL);
     } else if (self->mount) {
 	g_mount_eject (self->mount, G_MOUNT_UNMOUNT_NONE,
-		       NULL, NULL, NULL);
+		       NULL, eject_finish, NULL);
     } else {
 	g_return_if_reached();
     }