From 0d0d95d2cbab6973c1df45787f8dfa66b79f3f21 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Mon, 29 Sep 2014 13:00:33 +0200 Subject: file-operations: fix copying from the trash Use original basename (not path) when creating target path. https://bugzilla.gnome.org/show_bug.cgi?id=721981 --- libnautilus-private/nautilus-file-operations.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 74ae1941a..3b531f15e 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -3632,7 +3632,7 @@ get_target_file_with_custom_name (GFile *src, /* if file is being restored from trash make sure it uses its original name */ if (g_file_has_uri_scheme (src, "trash")) { - copyname = g_strdup (g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH)); + copyname = g_path_get_basename (g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH)); } if (copyname == NULL) { -- cgit v1.2.1