|
Line
Link Here
|
| 0 |
-- xfburn/xfburn-data-composition.c |
0 |
++ xfburn/xfburn-data-composition.c |
|
Lines 1852-1877
Link Here
|
| 1852 |
g_error ("Failed adding %s as a node to the image: code %X!", src, r); |
1852 |
g_error ("Failed adding %s as a node to the image: code %X!", src, r); |
| 1853 |
} |
1853 |
} |
| 1854 |
|
1854 |
|
| 1855 |
basename = g_path_get_basename (src); |
1855 |
/* Check names only for items not manually created (#613563) */ |
|
|
1856 |
if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { |
| 1857 |
basename = g_path_get_basename (src); |
| 1858 |
|
| 1859 |
/* check if the file has been renamed */ |
| 1860 |
if (strcmp (basename, name) != 0) { |
| 1861 |
/* rename the iso_node */ |
| 1862 |
r = iso_node_set_name (node, name); |
| 1863 |
|
| 1864 |
if (r == 0) { |
| 1865 |
/* The first string is the renamed name, the second one the original name */ |
| 1866 |
xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src); |
| 1867 |
|
| 1868 |
g_free (basename); |
| 1869 |
g_free (name); |
| 1870 |
g_free (src); |
| 1856 |
|
1871 |
|
| 1857 |
/* check if the file has been renamed */ |
1872 |
continue; |
| 1858 |
if (strcmp (basename, name) != 0) { |
1873 |
} |
| 1859 |
/* rename the iso_node */ |
|
|
| 1860 |
r = iso_node_set_name (node, name); |
| 1861 |
|
| 1862 |
if (r == 0) { |
| 1863 |
/* The first string is the renamed name, the second one the original name */ |
| 1864 |
xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src); |
| 1865 |
|
| 1866 |
g_free (basename); |
| 1867 |
g_free (name); |
| 1868 |
g_free (src); |
| 1869 |
|
| 1870 |
continue; |
| 1871 |
} |
1874 |
} |
|
|
1875 |
g_free (basename); |
| 1872 |
} |
1876 |
} |
| 1873 |
|
1877 |
|
| 1874 |
g_free (basename); |
|
|
| 1875 |
g_free (name); |
1878 |
g_free (name); |
| 1876 |
g_free (src); |
1879 |
g_free (src); |
| 1877 |
|
1880 |
|
