gvfs r1257 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 11 14:28:43 2008
New Revision: 1257
URL: http://svn.gnome.org/viewvc/gvfs?rev=1257&view=rev

Log:
2008-02-11  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendtrash.c:
	Set the correct copy name.
	Set description.



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendtrash.c

Modified: trunk/daemon/gvfsbackendtrash.c
==============================================================================
--- trunk/daemon/gvfsbackendtrash.c	(original)
+++ trunk/daemon/gvfsbackendtrash.c	Mon Feb 11 14:28:43 2008
@@ -905,7 +905,7 @@
   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 @@
                   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);