rpm/gvfs
SHA256
1
0
Fork 0
forked from pool/gvfs
Code Pull Requests Activity

Accepting request 205169 from GNOME:Factory

Browse Source 
- Add gvfs-webdav_file_types.patch: fix webdav access over
  gvfsd-fuse, resulting in Input/output error (bnc#848129).

Also wanted for 13.1

OBS-URL: https://build.opensuse.org/request/show/205169
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=101
This commit is contained in:
Tomáš Chvátal 2013-10-30 15:02:20 +00:00 committed by Git OBS Bridge
commit 18f84935d0
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gvfs-webdav_file_types.patch Normal file
View File

@ -0,0 +1,45 @@
From 921b813784ba0505fff76edb1a3bd20c40b78b75 Mon Sep 17 00:00:00 2001
From: Ross Lagerwall <rosslagerwall@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

6
gvfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 26 17:57:13 UTC 2013 - stefan.bruens@rwth-aachen.de
- Add gvfs-webdav_file_types.patch: fix webdav access over
gvfsd-fuse, resulting in Input/output error (bnc#848129).
-------------------------------------------------------------------
Thu Oct 3 12:50:22 UTC 2013 - dimstar@opensuse.org

3
gvfs.spec
View File

@ -32,6 +32,8 @@ Source99: baselibs.conf
Patch5: gvfs-nvvfs.patch
# PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
Patch6: gvfs-nds.patch
# PATCH-FIX-UPSTREAM gvfs-webdav_file_types.patch bgo#706798 bnc#848129 stefan.bruens@rwth-aachen.de -- gvfs-webdav_file_types.patch
Patch7: gvfs-webdav_file_types.patch
BuildRequires: bluez-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fuse-devel
@ -139,6 +141,7 @@ VFS functionality for GLib.
translation-update-upstream
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
autoreconf -f