Attachment 607092 Details for Bug 851900 – Patch to correct the bug

[patch] Patch to correct the bug

xfburn-0.4.3-newdirectorybug.patch (text/plain), 1.58 KB, created by Ronan Arraes Jardim Chagas on 2012-08-27 02:06:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ronan Arraes Jardim Chagas

Created: 2012-08-27 02:06:00 UTC

Size: 1.58 KB

patch

obsolete

>--- xfburn-0.4.3/xfburn/xfburn-data-composition.c	2011-02-17 16:37:03.000000000 +0100
>+++ xfburn-0.4.3/xfburn/xfburn-data-composition_patched.c	2011-02-17 16:40:40.000000000 +0100
>@@ -1874,26 +1874,29 @@
>           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
>       }
> 
>-      basename = g_path_get_basename (src);
>+      /* Check names only for items not manually created (#613563) */
>+      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
>+        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_warn (_("Duplicate filename '%s' for '%s'"), name, src);
>+
>+            g_free (basename);
>+            g_free (name);
>+            g_free (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_warn (_("Duplicate filename '%s' for '%s'"), name, src);
>-
>-          g_free (basename);
>-          g_free (name);
>-          g_free (src);
>-
>-          continue;
>+            continue;
>+          }
>         }
>+        g_free (basename);
>       }
> 
>-      g_free (basename);
>       g_free (name);
>       g_free (src);
>

Actions: View | Diff

Attachments on bug 851900: 607092