[Pkg-xfce-commits] r7269 - in goodies/trunk/xfburn/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Dec 31 06:24:03 UTC 2012
Author: corsac
Date: 2012-12-31 06:24:02 +0000 (Mon, 31 Dec 2012)
New Revision: 7269
Added:
goodies/trunk/xfburn/debian/patches/0001-Don-t-check-source-file-for-user-created-directories.patch
Modified:
goodies/trunk/xfburn/debian/changelog
goodies/trunk/xfburn/debian/patches/series
Log:
0001-Don-t-check-source-file-for-user-created-directories cherry-picked
from git master, fix crash at burn time when adding a new directory to a
composition. closes: #613563
Modified: goodies/trunk/xfburn/debian/changelog
===================================================================
--- goodies/trunk/xfburn/debian/changelog 2012-12-31 06:14:58 UTC (rev 7268)
+++ goodies/trunk/xfburn/debian/changelog 2012-12-31 06:24:02 UTC (rev 7269)
@@ -3,6 +3,9 @@
* debian/patches:
- es-translation-update added, improve Spanish translation, thanks Fco.
Javier Fernández Serrador. closes: #696599
+ - 0001-Don-t-check-source-file-for-user-created-directories cherry-picked
+ from git master, fix crash at burn time when adding a new directory to a
+ composition. closes: #613563
* debian/control:
- update debhelper build-dep to 9 since we use compat mode 9.
Added: goodies/trunk/xfburn/debian/patches/0001-Don-t-check-source-file-for-user-created-directories.patch
===================================================================
--- goodies/trunk/xfburn/debian/patches/0001-Don-t-check-source-file-for-user-created-directories.patch (rev 0)
+++ goodies/trunk/xfburn/debian/patches/0001-Don-t-check-source-file-for-user-created-directories.patch 2012-12-31 06:24:02 UTC (rev 7269)
@@ -0,0 +1,63 @@
+From 611d915887b09148e74c28704dc5a0bef16d90fd Mon Sep 17 00:00:00 2001
+From: David Mohr <david at mcbf.net>
+Date: Sat, 16 Jun 2012 17:22:55 +0200
+Subject: [PATCH] Don't check source file for user created directories.
+
+---
+ xfburn/xfburn-data-composition.c | 37 ++++++++++++++++++++-----------------
+ 1 file changed, 20 insertions(+), 17 deletions(-)
+
+diff --git a/xfburn/xfburn-data-composition.c b/xfburn/xfburn-data-composition.c
+index 052788e..fc54cd4 100644
+--- a/xfburn/xfburn-data-composition.c
++++ b/xfburn/xfburn-data-composition.c
+@@ -1867,26 +1867,29 @@ fill_image_with_composition (GtkTreeModel *model, IsoImage *image, IsoDir * pare
+ g_error ("Failed adding %s as a node to the image: code %X!", src, r);
+ }
+
+- basename = g_path_get_basename (src);
+-
+- /* check if the file has been renamed */
+- if (strcmp (basename, name) != 0) {
+- /* rename the iso_node */
+- r = iso_node_set_name (node, name);
+-
+- if (r == 0) {
+- /* The first string is the renamed name, the second one the original name */
+- xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
+-
+- g_free (basename);
+- g_free (name);
+- g_free (src);
+-
+- continue;
++ if (src != '\0') {
++ basename = g_path_get_basename (src);
++
++ /* check if the file has been renamed */
++ if (strcmp (basename, name) != 0) {
++ /* rename the iso_node */
++ r = iso_node_set_name (node, name);
++
++ if (r == 0) {
++ /* The first string is the renamed name, the second one the original name */
++ xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
++
++ g_free (basename);
++ g_free (name);
++ g_free (src);
++
++ continue;
++ }
+ }
++
++ g_free (basename);
+ }
+
+- g_free (basename);
+ g_free (name);
+ g_free (src);
+
+--
+1.7.10.4
+
Modified: goodies/trunk/xfburn/debian/patches/series
===================================================================
--- goodies/trunk/xfburn/debian/patches/series 2012-12-31 06:14:58 UTC (rev 7268)
+++ goodies/trunk/xfburn/debian/patches/series 2012-12-31 06:24:02 UTC (rev 7269)
@@ -1,3 +1,4 @@
xfburn-gio.patch
xfburn-ui.patch
es-translation-update.patch
+0001-Don-t-check-source-file-for-user-created-directories.patch
More information about the Pkg-xfce-commits
mailing list