Commit 5e9b6fca authored by Luis Medinas's avatar Luis Medinas

Merge changes on brasero 0.7 stable branch to trunk.


svn path=/trunk/; revision=603
parent 8a9b462b
2008-01-19 Philippe Rouquier <philippr@svn.gnome.org>
Fix for #510479 – Automatically set version in X-GNOME-Bugzilla-Version desktop key
patch by Luca Ferretti
* configure.in:
* data/brasero.desktop.in:
* data/brasero.desktop.in.in:
2008-01-19 Philippe Rouquier <philippr@svn.gnome.org>
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
2008-01-18 Luis Medinas <lmedinas@svn.gnome.org>
* data/brasero.desktop.in:
......@@ -39,6 +54,19 @@
Added a workaround to use genisoimage if it's available
if not will use mkisofs.
=======
2008-01-19 Philippe Rouquier <philippr@svn.gnome.org>
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
* configure.in:
* src/brasero-project.c: (brasero_project_check_size):
* src/brasero-vfs.c: (brasero_vfs_add_playlist_entry_parsed_cb),
(brasero_vfs_playlist_thread):
>>>>>>> .merge-right.r601
2008-01-11 Luis Medinas <lmedinas@svn.gnome.org>
* src/burn-medium.c:
......
......@@ -190,7 +190,7 @@ fi
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 @@ AC_OUTPUT([
Makefile
docs/Makefile
data/Makefile
data/brasero.desktop.in
data/icons/Makefile
src/plugins/Makefile
src/plugins/cdrdao/Makefile
......
......@@ -6,14 +6,14 @@ Categories=GNOME;Application;AudioVideo;
Encoding=UTF-8
Exec=brasero %U
Icon=brasero
MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;application/x-brasero;x-content/blank-cd:x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;application/x-brasero;
StartupNotify=true
Terminal=false
Type=Application
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=brasero
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=0.7.0
X-GNOME-Bugzilla-Version=@VERSION@
Actions=BurnImage;OpenProject;
......
......@@ -568,13 +568,11 @@ brasero_project_check_size (BraseroProject *project)
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);
......
......@@ -1500,11 +1500,10 @@ brasero_vfs_playlist_result (BraseroAsyncTaskManager *manager,
}
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 @@ brasero_vfs_playlist_thread (BraseroAsyncTaskManager *manager,
"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"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment