brasero r1013 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Jul 18 11:37:08 2008
New Revision: 1013
URL: http://svn.gnome.org/viewvc/brasero?rev=1013&view=rev

Log:
	Fixes for video projects:
	- crash fixed (#543505 â crash in Brasero svn trunk r1010 when adding a .ogg file to a video project.)
	- wrong values for signals

	* src/brasero-io.c (brasero_io_get_metadata_info):
	* src/brasero-video-project.c
	(brasero_video_project_add_directory_contents_result),
	(brasero_video_project_result_cb):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-io.c
   trunk/src/brasero-video-disc.c
   trunk/src/brasero-video-project.c

Modified: trunk/src/brasero-io.c
==============================================================================
--- trunk/src/brasero-io.c	(original)
+++ trunk/src/brasero-io.c	Fri Jul 18 11:37:08 2008
@@ -682,10 +682,9 @@
 			}
 		}
 
-		/* remove it from the queue since we can't keep the same
-		 * URI twice */
-		brasero_metadata_info_free (node->data);
-		g_queue_remove (priv->meta_buffer, node->data);
+		/* remove it from the queue => no same URI twice */
+		g_queue_remove (priv->meta_buffer, cached);
+		brasero_io_metadata_cached_free (cached);
 
 		BRASERO_BURN_LOG ("Updating cache information for %s", uri);
 	}

Modified: trunk/src/brasero-video-disc.c
==============================================================================
--- trunk/src/brasero-video-disc.c	(original)
+++ trunk/src/brasero-video-disc.c	Fri Jul 18 11:37:08 2008
@@ -313,7 +313,7 @@
 		return ;
 	}
 
-    	BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
+	BRASERO_GET_BASENAME_FOR_DISPLAY (uri, name);
 	dialog = gtk_message_dialog_new (GTK_WINDOW (toplevel),
 					 GTK_DIALOG_DESTROY_WITH_PARENT|
 					 GTK_DIALOG_MODAL,

Modified: trunk/src/brasero-video-project.c
==============================================================================
--- trunk/src/brasero-video-project.c	(original)
+++ trunk/src/brasero-video-project.c	Fri Jul 18 11:37:08 2008
@@ -594,9 +594,7 @@
 	/* update size */
 	g_signal_emit (BRASERO_VIDEO_PROJECT (obj),
 		       brasero_video_project_signals [SIZE_CHANGED_SIGNAL],
-		       0,
-		       error,
-		       uri);
+		       0);
 }
 
 static void
@@ -676,8 +674,8 @@
 
 		/* Ask the user */
 		result = brasero_video_project_file_signal (self,
-							   DIRECTORY_URI_SIGNAL,
-							   uri);
+							    DIRECTORY_URI_SIGNAL,
+							    uri);
 
 		/* NOTE: we need to pass a sibling here even if that the file
 		 * that's going to be deleted just after. */
@@ -696,7 +694,6 @@
 		g_signal_emit (self,
 			       brasero_video_project_signals [NOT_VIDEO_SIGNAL],
 			       0,
-			       error,
 			       uri);
 
 		brasero_video_project_remove_file (self, file);