Updating branch refs/heads/master
to 611d915887b09148e74c28704dc5a0bef16d90fd (commit)
from fbaf8173845cccc7b987f85d8357de09790ac277 (commit)
commit 611d915887b09148e74c28704dc5a0bef16d90fd
Author: David Mohr <[email protected]>
Date: Sat Jun 16 17:22:55 2012 +0200
Don't check source file for user created directories.
xfburn/xfburn-data-composition.c | 37 ++++++++++++++++++++-----------------
1 files 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);
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
