[gvfs/f18] Fix dav input output error (#919767)

[Ondrej Holy]

commit 5d6d61a9ead669ab0cb88e3a2da4e22ffe71c17b
Author: Ondrej Holy <oholy at redhat.com>
Date:   Fri Nov 22 14:02:02 2013 +0100

    Fix dav input output error (#919767)

 ...3-dav-Set-file-type-to-regular-by-default.patch |   45 ++++++++++++++++++++
 gvfs.spec                                          |    9 ++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/gvfs-1.18.3-dav-Set-file-type-to-regular-by-default.patch b/gvfs-1.18.3-dav-Set-file-type-to-regular-by-default.patch
new file mode 100644
index 0000000..91c6d29
--- /dev/null
+++ b/gvfs-1.18.3-dav-Set-file-type-to-regular-by-default.patch
@@ -0,0 +1,45 @@
+From 921b813784ba0505fff76edb1a3bd20c40b78b75 Mon Sep 17 00:00:00 2001
+From: Ross Lagerwall <rosslagerwall at gmail.com>
+Date: Fri, 11 Oct 2013 22:04:51 +0200
+Subject: [PATCH] dav: Set file type to regular by default
+
+Some servers send empty resourcetype nodes or don't send the node at all
+for regular files (the spec says that it defaults to empty).  Set the
+file type to regular by default.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706798
+---
+ daemon/gvfsbackenddav.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
+index 2feb980..39995d6 100644
+--- a/daemon/gvfsbackenddav.c
++++ b/daemon/gvfsbackenddav.c
+@@ -991,7 +991,7 @@ ms_response_to_file_info (MsResponse *response,
+   g_file_info_set_name (info, basename);
+   g_file_info_set_edit_name (info, basename);
+ 
+-  file_type = G_FILE_TYPE_UNKNOWN;
++  file_type = G_FILE_TYPE_REGULAR;
+   mime_type = NULL;
+ 
+   have_display_name = FALSE;
+@@ -1013,7 +1013,6 @@ ms_response_to_file_info (MsResponse *response,
+           if (node_has_name (node, "resourcetype"))
+             {
+               file_type = parse_resourcetype (node);
+-              g_file_info_set_file_type (info, file_type);
+             }
+           else if (node_has_name (node, "displayname") && text)
+             {
+@@ -1059,6 +1058,7 @@ ms_response_to_file_info (MsResponse *response,
+         }
+     }
+ 
++  g_file_info_set_file_type (info, file_type);
+   if (file_type == G_FILE_TYPE_DIRECTORY)
+     {
+       icon = g_themed_icon_new ("folder");
+-- 
+1.8.1.5
\ No newline at end of file
diff --git a/gvfs.spec b/gvfs.spec
index f633816..a8a130a 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.14.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -50,6 +50,9 @@ Patch13: gvfs-1.17.1-metadata-Put-journal-in-XDG_RUNTIME_DIR-for-shared-N.patch
 Patch14: gvfs-1.17.1-metadata-Use-shorter-writeout-timeout-on-NFS.patch
 Patch15: gvfs-1.17.1-metadata-Flush-all-scheduled-writeouts-on-daemon-exi.patch
 
+# Fix dav input output error from upstream
+# https://bugzilla.redhat.com/show_bug.cgi?id=919767
+Patch16: gvfs-1.18.3-dav-Set-file-type-to-regular-by-default.patch
 
 Obsoletes: gnome-mount <= 0.8
 Obsoletes: gnome-mount-nautilus-properties <= 0.8
@@ -171,6 +174,7 @@ to applications using gvfs.
 %patch13 -p1 -b .metadata-Put-journal-in-XDG_RUNTIME_DIR-for-shared-NFS
 %patch14 -p1 -b .metadata-Use-shorter-writeout-timeout-on-NFS
 %patch15 -p1 -b .metadata-Flush-all-scheduled-writeouts-on-daemon-exit
+%patch16 -p1 -b .dav-Set-file-type-to-regular-by-default
 
 %build
 # Needed for gvfs-0.2.1-archive-integration.patch
@@ -351,6 +355,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/afp-browse.mount
 
 %changelog
+* Fri Nov 22 2013 Ondrej Holy <oholy at redhat.com> - 1.14.2-5
+- Fix dav input output error (#919767)
+
 * Tue May 14 2013 Tomas Bzatek <tbzatek at redhat.com> - 1.14.2-4
 - Fix metadata issues on NFS homedirs (#561904)