summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-02-11 14:28:43 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-02-11 14:28:43 +0000
commitc032d54671911a52186f4e16f74694783f4f5b48 (patch)
tree01be87ab4ba335ab418a27bdf2c6a41c295fd06d
parente7aa3d75636fb72b4671dfbdff058841c1dd86ce (diff)
downloadgvfs-c032d54671911a52186f4e16f74694783f4f5b48.tar.gz
Set the correct copy name. Set description.
2008-02-11 Alexander Larsson <alexl@redhat.com> * daemon/gvfsbackendtrash.c: Set the correct copy name. Set description. svn path=/trunk/; revision=1257
-rw-r--r--ChangeLog6
-rw-r--r--daemon/gvfsbackendtrash.c12
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 169bb821..66a3404a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-02-11 Alexander Larsson <alexl@redhat.com>
+ * daemon/gvfsbackendtrash.c:
+ Set the correct copy name.
+ Set description.
+
+2008-02-11 Alexander Larsson <alexl@redhat.com>
+
* daemon/gvfsbackendsmb.c:
(do_set_display_name):
Fix typo: get_dirname, not get_basename.
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 2f3b9ea3..8c6913e8 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -905,7 +905,7 @@ add_extra_trash_info (GFileInfo *file_info,
char *orig_path, *orig_path_key, *orig_path_unescaped, *date;
GKeyFile *keyfile;
char *display_name;
-
+ char *desc;
/* Override all writability */
g_file_info_set_attribute_boolean (file_info,
@@ -950,8 +950,18 @@ add_extra_trash_info (GFileInfo *file_info,
char *p = display_name;
display_name = g_strconcat (display_name, _(" (invalid encoding)"), NULL);
g_free (p);
+
+ 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_display_name (file_info, display_name);
+
+ desc = g_strdup_printf (_("%s (in trash)"), display_name);
+ g_file_info_set_attribute_string (file_info, G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION, desc);
+ g_free (desc);
+
g_free (display_name);