brasero r1861 - in trunk: . libbrasero-media

[philippr svn gnome org]

Author: philippr
Date: Mon Feb  2 21:02:47 2009
New Revision: 1861
URL: http://svn.gnome.org/viewvc/brasero?rev=1861&view=rev

Log:
2009-02-02  Philippe Rouquier  <ykw localhost localdomain>

	Clean the code and add more debug to catch a bug.

	* libbrasero-media/brasero-gio-operation.c
	(brasero_gio_operation_wait_for_operation_end),
	(brasero_gio_operation_umount_finish),
	(brasero_gio_operation_mount_finish),
	(brasero_gio_operation_eject_finish):
	* libbrasero-media/brasero-volume.c
	(brasero_volume_get_mount_point):


Modified:
   trunk/ChangeLog
   trunk/libbrasero-media/brasero-gio-operation.c
   trunk/libbrasero-media/brasero-volume.c

Modified: trunk/libbrasero-media/brasero-gio-operation.c
==============================================================================
--- trunk/libbrasero-media/brasero-gio-operation.c	(original)
+++ trunk/libbrasero-media/brasero-gio-operation.c	Mon Feb  2 21:02:47 2009
@@ -136,8 +136,19 @@
 		operation->timeout_id = 0;
 	}
 
-	if (operation->error) {
-		if (error)
+	if (operation->error) {
+		BRASERO_MEDIA_LOG ("Medium operation finished with an error %s"
+				   operation->error->message);
+
+		if (operation->error->code == G_IO_ERROR_FAILED_HANDLED) {
+			BRASERO_MEDIA_LOG ("Error already handled and displayed by GIO");
+
+			/* means we shouldn't display any error message since 
+			 * that was already done */
+			g_error_free (operation->error);
+			operation->error = NULL;
+		}
+		else if (error)
 			g_propagate_error (error, operation->error);
 		else
 			g_error_free (operation->error);
@@ -174,13 +185,7 @@
 	BRASERO_MEDIA_LOG ("Umount operation completed (result = %d)", op->result);
 
 	if (op->error) {
-		if (op->error->code == G_IO_ERROR_FAILED_HANDLED) {
-			/* means we shouldn't display any error message since 
-			 * that was already done */
-			g_error_free (op->error);
-			op->error = NULL;
-		}
-		else if (op->error->code == G_IO_ERROR_NOT_MOUNTED) {
+		if (op->error->code == G_IO_ERROR_NOT_MOUNTED) {
 			/* That can happen sometimes */
 			g_error_free (op->error);
 			op->error = NULL;
@@ -272,14 +277,7 @@
 					    &op->error);
 
 	if (op->error) {
-		if (op->error->code == G_IO_ERROR_FAILED_HANDLED) {
-			/* means we shouldn't display any error message since 
-			 * that was already done */
-			g_error_free (op->error);
-			op->error = NULL;
-			op->result = TRUE;
-		}
-		else if (op->error->code == G_IO_ERROR_ALREADY_MOUNTED) {
+		if (op->error->code == G_IO_ERROR_ALREADY_MOUNTED) {
 			g_error_free (op->error);
 			op->error = NULL;
 			op->result = TRUE;
@@ -370,16 +368,8 @@
 							   result,
 							   &operation->error);
 
-	if (operation->error) {
-		if (operation->error->code == G_IO_ERROR_FAILED_HANDLED) {
-			/* means we shouldn't display any error message since 
-			 * that was already done */
-			g_error_free (operation->error);
-			operation->error = NULL;
-		}
-
+	if (operation->error)
 		brasero_gio_operation_end (operation);
-	}
 	else if (!operation->result)
 		brasero_gio_operation_end (operation);
 }

Modified: trunk/libbrasero-media/brasero-volume.c
==============================================================================
--- trunk/libbrasero-media/brasero-volume.c	(original)
+++ trunk/libbrasero-media/brasero-volume.c	Mon Feb  2 21:02:47 2009
@@ -194,7 +194,8 @@
 	}
 	else {
 		local_path = g_file_get_path (root);
-		g_object_unref (root);
+		g_object_unref (root);
+		BRASERO_MEDIA_LOG ("Mount point is %s", local_path);
 	}
 
 	return local_path;