Commit 1776aaf9 authored by Jackson Doak's avatar Jackson Doak

Drop all patches, fixed upstream

parent a00f0dae
......@@ -5,6 +5,7 @@ xfburn (0.5.0-1) UNRELEASED; urgency=low
[ Jackson Doak ]
* New upstream release
* Drop all patches, fixed upstream
* debian/control:
- Bump standards-version to 3.9.5
- Add a homepage
......
From 611d915887b09148e74c28704dc5a0bef16d90fd Mon Sep 17 00:00:00 2001
From: David Mohr <david@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
Description: Fix build with newer glib and libxfce4util versions
Author: David Mohr <david@mcbf.net>
Origin: backport, http://git.xfce.org/apps/xfburn/commit/?id=b6470e6407bc4a72ebe5957aa59e589b2fc02903
Forwarded: not-needed
--- xfburn-0.4.3.orig/xfburn/xfburn-settings.h
+++ xfburn-0.4.3/xfburn/xfburn-settings.h
@@ -24,6 +24,7 @@
#endif /* !HAVE_CONFIG_H */
#include <glib.h>
+#include <glib-object.h>
G_BEGIN_DECLS
This diff is collapsed.
xfburn-gio.patch
xfburn-ui.patch
es-translation-update.patch
0001-Don-t-check-source-file-for-user-created-directories.patch
03_fix-missing-include.patch
This diff is collapsed.
This diff is collapsed.
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