summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2014-09-29 13:00:33 +0200
committerCarlos Soriano <csoriano@gnome.org>2016-03-07 16:08:19 +0100
commit0d0d95d2cbab6973c1df45787f8dfa66b79f3f21 (patch)
treeb8364805e604d97673405143538684c9464535bd
parentff0506fc841db7aebd6f68916622d4257ca6a76a (diff)
downloadnautilus-0d0d95d2cbab6973c1df45787f8dfa66b79f3f21.tar.gz
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
-rw-r--r--libnautilus-private/nautilus-file-operations.c2
1 files changed, 1 insertions, 1 deletions
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) {