[brasero/gnome-2-28] When eject operation is cancelled with GDrive don't try to eject with a GVolume

[Philippe Rouquier <philippr src gnome org>]

commit 47aaa86d4b9eaba57e54f7e2798bf4303094b8ce
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sat Oct 17 21:08:33 2009 +0200

    When eject operation is cancelled with GDrive don't try to eject with a GVolume

 libbrasero-media/brasero-drive.c         |    3 +++
 libbrasero-media/brasero-gio-operation.c |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libbrasero-media/brasero-drive.c b/libbrasero-media/brasero-drive.c
index 03c6b15..a7691d7 100644
--- a/libbrasero-media/brasero-drive.c
+++ b/libbrasero-media/brasero-drive.c
@@ -289,6 +289,9 @@ brasero_drive_eject (BraseroDrive *drive,
 							 error);
 		if (res)
 			return TRUE;
+
+		if (g_cancellable_is_cancelled (priv->cancel))
+			return FALSE;
 	}
 	else
 		BRASERO_MEDIA_LOG ("No GDrive");
diff --git a/libbrasero-media/brasero-gio-operation.c b/libbrasero-media/brasero-gio-operation.c
index 58452f6..023b09e 100644
--- a/libbrasero-media/brasero-gio-operation.c
+++ b/libbrasero-media/brasero-gio-operation.c
@@ -156,9 +156,7 @@ brasero_gio_operation_wait_for_operation_end (BraseroGioOperation *operation,
 		operation->error = NULL;
 	}
 
-	g_cancellable_reset (operation->cancel);
 	g_object_unref (operation->cancel);
-
 	return operation->result;
 }