[gvfs] trash: Support enumerating non-UTF-8 filenames

[Ross Lagerwall <rossl src gnome org>]

commit 990756b22795a13fb38c2a2b038da5758fa679ec
Author: Ross Lagerwall <rosslagerwall gmail com>
Date:   Tue Nov 5 10:38:21 2013 +0200

    trash: Support enumerating non-UTF-8 filenames
    
    Before when enumerating, display names were set directly from the
    filenames which can be a problem if the filename is not UTF-8.
    Instead, don't set the display name at all since it is set correctly via
    trash_backend_add_info().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656186

 daemon/gvfsbackendtrash.c |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 9e99cf9..d895e09 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -567,26 +567,11 @@ trash_backend_enumerate_root (GVfsBackendTrash      *backend,
 
       if (info)
         {
-          GFile *original;
-
           g_file_info_set_attribute_mask (info, attribute_matcher);
 
           g_file_info_set_name (info, trash_item_get_escaped_name (item));
           trash_backend_add_info (item, info, TRUE);
 
-          original = trash_item_get_original (item);
-
-          if (original)
-            {
-              char *basename;
-
-              basename = g_file_get_basename (original);
-
-              /* XXX utf8 */
-              g_file_info_set_display_name (info, basename);
-              g_free (basename);
-            }
-
           g_vfs_job_enumerate_add_info (job, info);
           g_object_unref (info);
         }