[gvfs] http: Provide edit-name whether display-name is also requested or not

[Tomas Bzatek <tbzatek src gnome org>]

commit db9d1795582ad888b1653f5b43718bbe263ff369
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Dec 6 12:16:40 2012 +0100

    http: Provide edit-name whether display-name is also requested or not
    
    https://bugzilla.gnome.org/show_bug.cgi?id=625741
    
    Signed-off-by: Tomas Bzatek <tbzatek redhat com>

 daemon/gvfsbackendhttp.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index bb8e1d0..a9d69dd 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -579,15 +579,12 @@ file_info_from_message (SoupMessage *msg,
   /* read http/1.1 rfc, until then we copy the local files
    * behaviour */ 
   if (basename != NULL &&
-      g_file_attribute_matcher_matches (matcher,
-                                        G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
+      (g_file_attribute_matcher_matches (matcher,
+                                         G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME) ||
+       g_file_attribute_matcher_matches (matcher,
+                                         G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME)))
     ed_name = gvfs_file_info_populate_names_as_local (info, basename);
 
-  if (ed_name != NULL &&
-      g_file_attribute_matcher_matches (matcher,
-                                        G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME))
-    g_file_info_set_edit_name (info, ed_name);
-
   g_free (basename);
   g_free (ed_name);