Author: philippr
Date: Sat Jan 19 19:55:41 2008
New Revision: 601
URL: http://svn.gnome.org/viewvc/brasero?rev=601&view=rev
Log:
fix for #510620 – brasero is not able to load a playlist in a Audio
project
update totem requirements to 2.20.x
remove duplicate calls
Modified:
branches/brasero_0_7/ChangeLog
branches/brasero_0_7/configure.in
branches/brasero_0_7/src/brasero-project.c
branches/brasero_0_7/src/brasero-vfs.c
Modified: branches/brasero_0_7/configure.in
==============================================================================
--- branches/brasero_0_7/configure.in (original)
+++ branches/brasero_0_7/configure.in Sat Jan 19 19:55:41 2008
@@ -186,7 +186,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]]],,
Modified: branches/brasero_0_7/src/brasero-project.c
==============================================================================
--- branches/brasero_0_7/src/brasero-project.c (original)
+++ branches/brasero_0_7/src/brasero-project.c Sat Jan 19 19:55:41 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: branches/brasero_0_7/src/brasero-vfs.c
==============================================================================
--- branches/brasero_0_7/src/brasero-vfs.c (original)
+++ branches/brasero_0_7/src/brasero-vfs.c Sat Jan 19 19:55:41 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"))
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
