[brasero] When eject operation is cancelled with GDrive don't try to eject with a GVolume
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [brasero] When eject operation is cancelled with GDrive don't try to eject with a GVolume
- Date: Sat, 17 Oct 2009 19:10:37 +0000 (UTC)
commit d6d1e1c445ddd01126d5f6569f6b15c5d598e3c7
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 455e4cb..d73ad54 100644
--- a/libbrasero-media/brasero-drive.c
+++ b/libbrasero-media/brasero-drive.c
@@ -298,6 +298,9 @@ brasero_drive_eject (BraseroDrive *drive,
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 6fc3cf3..a53fd00 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]