[gvfs] trash: Add " (invalid encoding)" to files with invalid encoding

[Ross Lagerwall <rossl src gnome org>]

commit 15d5da3f13f9325cab8d32316304ce49d0ff83fb
Author: Ross Lagerwall <rosslagerwall gmail com>
Date:   Tue Nov 5 10:46:19 2013 +0200

    trash: Add " (invalid encoding)" to files with invalid encoding
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656186

 daemon/gvfsbackendtrash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index d895e09..b25ee83 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -493,16 +493,15 @@ trash_backend_add_info (TrashItem *item,
 
       if (original)
         {
-          gchar *basename, *path;
+          gchar *edit_name, *path;
 
           path = g_file_get_path (original);
-          basename = g_filename_display_basename (path);
+          edit_name = gvfs_file_info_populate_names_as_local (info, path);
 
-          g_file_info_set_display_name (info, basename);
           g_file_info_set_attribute_byte_string (info,
                                                  G_FILE_ATTRIBUTE_TRASH_ORIG_PATH,
                                                  path);
-          g_free (basename);
+          g_free (edit_name);
           g_free (path);
         }