summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gvfsbackendtrash.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a7b0ea7..4b7257e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-16 Christian Neumair <cneumair@gnome.org>
+
+ * daemon/gvfsbackendtrash.c (add_extra_trash_info):
+ Correctly set copy name to original file name. Fixes #41852.
+
2008-08-07 Jesse van den Kieboom <jesse@icecrew.nl>
* client/gdaemonfileoutputstream.c:
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index be3dd961..8a70508e 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -1009,7 +1009,10 @@ add_extra_trash_info (GFileInfo *file_info,
g_file_info_set_attribute_string (file_info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, NULL);
}
else
- g_file_info_set_attribute_string (file_info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, display_name);
+ {
+ g_file_info_set_attribute_string (file_info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME, display_name);
+ g_file_info_set_attribute_string (file_info, G_FILE_ATTRIBUTE_STANDARD_COPY_NAME, display_name);
+ }
g_file_info_set_display_name (file_info, display_name);