r35920 - in /desktop/unstable/brasero/debian: changelog patches/01_grafted_folders.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Oct 11 21:16:52 2012
New Revision: 35920

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35920
Log:
debian/patches/01_grafted_folders.patch: Fix a segfault when creating
subfolders in a data project. Patch courtesy of Andrej Belym.
Closes: #659061

Added:
    desktop/unstable/brasero/debian/patches/01_grafted_folders.patch
Modified:
    desktop/unstable/brasero/debian/changelog
    desktop/unstable/brasero/debian/patches/series

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=35920&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Thu Oct 11 21:16:52 2012
@@ -1,5 +1,8 @@
 brasero (3.4.1-4) UNRELEASED; urgency=low
 
+  * debian/patches/01_grafted_folders.patch: Fix a segfault when creating
+    subfolders in a data project. Patch courtesy of Andrej Belym.
+    Closes: #659061
   * debian/patches/04_put-settings-in-the-correct-path.patch: Use correct
     schema path /org/gnome/brasero instead of /apps/brasero. Patch
     cherry-picked from upstream Git.

Added: desktop/unstable/brasero/debian/patches/01_grafted_folders.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/01_grafted_folders.patch?rev=35920&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/01_grafted_folders.patch (added)
+++ desktop/unstable/brasero/debian/patches/01_grafted_folders.patch [utf-8] Thu Oct 11 21:16:52 2012
@@ -1,0 +1,16 @@
+Description: Fixed segfault when renaming or removing folder in project.
+  When adding folder from filesystem to project and creating new folder in this folder, removing or renaming causes segfault.
+  This happens because new folder must have flag 'is_grafted' (project node not from real file or folder), but code in brasero-data-project.c in function brasero_data_project_add_node_real doesn't handle nodes with flag 'is_fake' correctly (new empty folder has this flag). Node isn't marked as grafted with function brasero_file_node_graft. I've just added call of this function.
+Author: Andrej Belym <white.wolf.2105 at gmail.com>
+Index: brasero-3.2.0/libbrasero-burn/brasero-data-project.c
+=============================================================
+--- brasero-3.2.0.orig/libbrasero-burn/brasero-data-project.c
++++ brasero-3.2.0/libbrasero-burn/brasero-data-project.c
+@@ -1674,6 +1674,7 @@ brasero_data_project_add_node_real (Bras
+ 		/* The node is a fake directory; graft it as well as all the 
+ 		 * nodes already in the tree with the same URI */
+ 		graft = brasero_data_project_uri_graft_nodes (self, uri);
++		brasero_file_node_graft (node, graft);
+ 	}
+ 	else {
+ 		gchar *parent_uri;

Modified: desktop/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/series?rev=35920&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/series [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/series [utf-8] Thu Oct 11 21:16:52 2012
@@ -1,2 +1,3 @@
+01_grafted_folders.patch
 03_cue-invalid-frame-75.patch
 04_put-settings-in-the-correct-path.patch