brasero r731 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Apr 18 08:00:22 2008
New Revision: 731
URL: http://svn.gnome.org/viewvc/brasero?rev=731&view=rev

Log:

	Fix a problem where metadata didn\'t say when it was cancelled leading to unloaded files in audio project
	Remove some debug statements
	Revert one patch to fix an unidentified crash

	* src/brasero-audio-disc.c
	(brasero_audio_disc_set_row_from_metadata),
	(brasero_audio_disc_add_uri_real):
	* src/brasero-io.c (brasero_io_unref_result_callback_data),
	(brasero_io_push_job), (brasero_io_get_metadata_info),
	(brasero_io_get_file_count_process_file):
	* src/brasero-metadata.c (brasero_metadata_completed),
	(brasero_metadata_bus_messages), (brasero_metadata_get_info_wait):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-io.c
   trunk/src/brasero-metadata.c

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Fri Apr 18 08:00:22 2008
@@ -1170,7 +1170,6 @@
 			    START_COL, &start,
 			    END_COL, &end,
 			    -1);
-	g_print ("%lli %lli\n", start, end);
 
 	/* make sure there is a length and it's not over the real one */
 	current_length = BRASERO_AUDIO_TRACK_LENGTH (start, end);
@@ -1629,7 +1628,6 @@
 	g_free (markup);
 
 	start = start > 0 ? start:0;
-	g_print (" END %lli %lli\n", start, end);
 	if (end > 0 && end > start) {
 		gchar *string;
 		gint64 length;

Modified: trunk/src/brasero-io.c
==============================================================================
--- trunk/src/brasero-io.c	(original)
+++ trunk/src/brasero-io.c	Fri Apr 18 08:00:22 2008
@@ -258,7 +258,7 @@
 	if (destroy)
 		destroy (object,
 			 cancelled,
-			 data);
+			 data->callback_data);
 	g_free (data);
 }
 
@@ -434,7 +434,6 @@
 						  BRASERO_ASYNC_NORMAL,
 						  type,
 						  job);
-
 }
 
 /**
@@ -666,6 +665,7 @@
 
 			copy = g_new0 (BraseroMetadataInfo, 1);
 			brasero_metadata_set_info (metadata, copy);
+
 			g_queue_push_head (priv->meta_buffer, copy);
 			if (g_queue_get_length (priv->meta_buffer) > MAX_BUFFERED_META) {
 				meta_info = g_queue_pop_tail (priv->meta_buffer);
@@ -1107,7 +1107,6 @@
 						       info,
 						       BRASERO_METADATA_FLAG_NONE,
 						       &metadata);
-
 		if (result)
 			data->total_b += metadata.len;
 

Modified: trunk/src/brasero-metadata.c
==============================================================================
--- trunk/src/brasero-metadata.c	(original)
+++ trunk/src/brasero-metadata.c	Fri Apr 18 08:00:22 2008
@@ -306,7 +306,6 @@
 	BraseroMetadataPrivate *priv;
 
 	priv = BRASERO_METADATA_PRIVATE (self);
-
 	if ((!priv->loop || !g_main_loop_is_running (priv->loop)) && !priv->cond) {
 		/* we send a message only if we haven't got a loop (= async mode) */
 		g_object_ref (self);
@@ -514,8 +513,9 @@
 		gst_message_parse_error (msg, &error, &debug_string);
 		BRASERO_BURN_LOG (debug_string);
 		g_free (debug_string);
+		if (!priv->error && error)
+			priv->error = error;
 
-		priv->error = error;
 		brasero_metadata_completed (self);
 		break;
 
@@ -843,7 +843,7 @@
 		return FALSE;
 	}
 
-	return TRUE;
+	return (g_cancellable_is_cancelled (cancel) == FALSE);
 }
 
 gboolean