brasero r733 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Apr 19 08:24:11 2008
New Revision: 733
URL: http://svn.gnome.org/viewvc/brasero?rev=733&view=rev

Log:
	Improvements for volume unmounting/mounting (trunk specific)
	Don\'t return an error if volume is already unmounted/mounted

	* src/burn-volume-obj.c (brasero_volume_umount_finish),
	(brasero_volume_mount_finish), (brasero_volume_eject_finish):
	* src/burn.c (brasero_burn_eject_dest_media):

Modified:
   trunk/ChangeLog
   trunk/src/burn-volume-obj.c
   trunk/src/burn.c

Modified: trunk/src/burn-volume-obj.c
==============================================================================
--- trunk/src/burn-volume-obj.c	(original)
+++ trunk/src/burn-volume-obj.c	Sat Apr 19 08:24:11 2008
@@ -222,6 +222,13 @@
 
 	if (priv->error) {
 		if (priv->error->code == G_IO_ERROR_FAILED_HANDLED) {
+			/* means we shouldn't display any error message since 
+			 * that was already done */
+			g_error_free (priv->error);
+			priv->error = NULL;
+		}
+		else if (priv->error->code == G_IO_ERROR_NOT_MOUNTED) {
+			/* That can happen sometimes */
 			g_error_free (priv->error);
 			priv->error = NULL;
 		}
@@ -296,6 +303,12 @@
 
 	if (priv->error) {
 		if (priv->error->code == G_IO_ERROR_FAILED_HANDLED) {
+			/* means we shouldn't display any error message since 
+			 * that was already done */
+			g_error_free (priv->error);
+			priv->error = NULL;
+		}
+		else if (priv->error->code == G_IO_ERROR_ALREADY_MOUNTED) {
 			g_error_free (priv->error);
 			priv->error = NULL;
 		}
@@ -383,6 +396,8 @@
 
 	if (priv->error) {
 		if (priv->error->code == G_IO_ERROR_FAILED_HANDLED) {
+			/* means we shouldn't display any error message since 
+			 * that was already done */
 			g_error_free (priv->error);
 			priv->error = NULL;
 		}

Modified: trunk/src/burn.c
==============================================================================
--- trunk/src/burn.c	(original)
+++ trunk/src/burn.c	Sat Apr 19 08:24:11 2008
@@ -246,7 +246,7 @@
 
 	medium = brasero_drive_get_medium (priv->dest);
 	if (brasero_volume_is_mounted (BRASERO_VOLUME (medium)))
-		brasero_volume_umount (BRASERO_VOLUME (medium), FALSE, NULL);
+		brasero_volume_umount (BRASERO_VOLUME (medium), TRUE, NULL);
 
 	if (priv->dest_locked) {
 		priv->dest_locked = 0;
@@ -1009,7 +1009,7 @@
 
 	medium = brasero_drive_get_medium (priv->src);
 	if (priv->mounted_by_us) {
-		brasero_volume_umount (BRASERO_VOLUME (medium), FALSE, NULL);
+		brasero_volume_umount (BRASERO_VOLUME (medium), TRUE, NULL);
 		priv->mounted_by_us = 0;
 	}