brasero r603 - in trunk: . data src

[lmedinas svn gnome org]

Author: lmedinas
Date: Sat Jan 19 20:48:25 2008
New Revision: 603
URL: http://svn.gnome.org/viewvc/brasero?rev=603&view=rev

Log:
Merge changes on brasero 0.7 stable branch to trunk.



Added:
   trunk/data/brasero.desktop.in.in
      - copied unchanged from r602, /branches/brasero_0_7/data/brasero.desktop.in.in
Removed:
   trunk/data/brasero.desktop.in
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/brasero-project.c
   trunk/src/brasero-vfs.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jan 19 20:48:25 2008
@@ -190,7 +190,7 @@
 AM_CONDITIONAL(BUILD_SEARCH, test x"$build_search" = "xyes")
 
 dnl ****************check for playlist (optional)**************
-TOTEM_REQUIRED=1.2.0
+TOTEM_REQUIRED=2.20.0
 
 AC_ARG_ENABLE(playlist,
 			[  --enable-playlist		build playlist pane (if totem is available)[[default = yes]]],,
@@ -300,6 +300,7 @@
 Makefile
 docs/Makefile
 data/Makefile
+data/brasero.desktop.in
 data/icons/Makefile
 src/plugins/Makefile
 src/plugins/cdrdao/Makefile

Modified: trunk/src/brasero-project.c
==============================================================================
--- trunk/src/brasero-project.c	(original)
+++ trunk/src/brasero-project.c	Sat Jan 19 20:48:25 2008
@@ -568,13 +568,11 @@
 end:
 	if (project->priv->oversized) {
 		sensitive = FALSE;
-		g_object_set (G_OBJECT (project->priv->data), "reject-file", TRUE, NULL);
-		g_object_set (G_OBJECT (project->priv->data), "reject-file", TRUE, NULL);
+		g_object_set (G_OBJECT (project->priv->current), "reject-file", TRUE, NULL);
 	}
 	else {
 		sensitive = TRUE;
-		g_object_set (G_OBJECT (project->priv->data), "reject-file", FALSE, NULL);
-		g_object_set (G_OBJECT (project->priv->data), "reject-file", FALSE, NULL);
+		g_object_set (G_OBJECT (project->priv->current), "reject-file", FALSE, NULL);
 	}
 
 	brasero_project_set_add_button_state (project);

Modified: trunk/src/brasero-vfs.c
==============================================================================
--- trunk/src/brasero-vfs.c	(original)
+++ trunk/src/brasero-vfs.c	Sat Jan 19 20:48:25 2008
@@ -1500,11 +1500,10 @@
 }
 
 static void
-brasero_vfs_add_playlist_entry_cb (TotemPlParser *parser,
-				   const gchar *uri,
-				   const gchar *title,
-				   const gchar *genre,
-				   BraseroVFSPlaylistData *data)
+brasero_vfs_add_playlist_entry_parsed_cb (TotemPlParser *parser,
+					  const gchar *uri,
+					  GHashTable *metadata,
+					  BraseroVFSPlaylistData *data)
 {
 	data->uris = g_list_prepend (data->uris, g_strdup (uri));
 }
@@ -1536,9 +1535,9 @@
 			  "playlist-end",
 			  G_CALLBACK (brasero_vfs_start_end_playlist_cb),
 			  data);
-	g_signal_connect (G_OBJECT (data->parser),
-			  "entry",
-			  G_CALLBACK (brasero_vfs_add_playlist_entry_cb),
+	g_signal_connect (data->parser,
+			  "entry-parsed",
+			  G_CALLBACK (brasero_vfs_add_playlist_entry_parsed_cb),
 			  data);
 
 	if (g_object_class_find_property (G_OBJECT_GET_CLASS (data->parser), "recurse"))