diff options
Diffstat (limited to 'testing/xfburn/fix_empty_dir_segfault.diff')
-rw-r--r-- | testing/xfburn/fix_empty_dir_segfault.diff | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/testing/xfburn/fix_empty_dir_segfault.diff b/testing/xfburn/fix_empty_dir_segfault.diff deleted file mode 100644 index af3fe07c8..000000000 --- a/testing/xfburn/fix_empty_dir_segfault.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 -+++ 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); - |