>> I'm not conviced that it's the same than #592524 because it doesn't
>> look
>> like to happen at any time.
>>
>> However I tried to solve my problem, and following patch for
>> xfburn-data-composition.c seems to correct my problem. Could you check
>> it ?
>
> Please send it as a unified diff :) (it might be worth directly pushing
> it upstream too, if we didn't do it in the meantime)
>
> Regards,
Ok; here is the unified diff.
--
manu
--- 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);
_______________________________________________
Pkg-xfce-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-xfce-devel
