|
 |
5d6d61a |
From 921b813784ba0505fff76edb1a3bd20c40b78b75 Mon Sep 17 00:00:00 2001
|
|
|
5d6d61a |
From: Ross Lagerwall <rosslagerwall@gmail.com>
|
|
|
5d6d61a |
Date: Fri, 11 Oct 2013 22:04:51 +0200
|
|
|
5d6d61a |
Subject: [PATCH] dav: Set file type to regular by default
|
|
|
5d6d61a |
|
|
|
5d6d61a |
Some servers send empty resourcetype nodes or don't send the node at all
|
|
|
5d6d61a |
for regular files (the spec says that it defaults to empty). Set the
|
|
|
5d6d61a |
file type to regular by default.
|
|
|
5d6d61a |
|
|
|
5d6d61a |
https://bugzilla.gnome.org/show_bug.cgi?id=706798
|
|
|
5d6d61a |
---
|
|
|
5d6d61a |
daemon/gvfsbackenddav.c | 4 ++--
|
|
|
5d6d61a |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
5d6d61a |
|
|
|
5d6d61a |
diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
|
|
|
5d6d61a |
index 2feb980..39995d6 100644
|
|
|
5d6d61a |
--- a/daemon/gvfsbackenddav.c
|
|
|
5d6d61a |
+++ b/daemon/gvfsbackenddav.c
|
|
|
5d6d61a |
@@ -991,7 +991,7 @@ ms_response_to_file_info (MsResponse *response,
|
|
|
5d6d61a |
g_file_info_set_name (info, basename);
|
|
|
5d6d61a |
g_file_info_set_edit_name (info, basename);
|
|
|
5d6d61a |
|
|
|
5d6d61a |
- file_type = G_FILE_TYPE_UNKNOWN;
|
|
|
5d6d61a |
+ file_type = G_FILE_TYPE_REGULAR;
|
|
|
5d6d61a |
mime_type = NULL;
|
|
|
5d6d61a |
|
|
|
5d6d61a |
have_display_name = FALSE;
|
|
|
5d6d61a |
@@ -1013,7 +1013,6 @@ ms_response_to_file_info (MsResponse *response,
|
|
|
5d6d61a |
if (node_has_name (node, "resourcetype"))
|
|
|
5d6d61a |
{
|
|
|
5d6d61a |
file_type = parse_resourcetype (node);
|
|
|
5d6d61a |
- g_file_info_set_file_type (info, file_type);
|
|
|
5d6d61a |
}
|
|
|
5d6d61a |
else if (node_has_name (node, "displayname") && text)
|
|
|
5d6d61a |
{
|
|
|
5d6d61a |
@@ -1059,6 +1058,7 @@ ms_response_to_file_info (MsResponse *response,
|
|
|
5d6d61a |
}
|
|
|
5d6d61a |
}
|
|
|
5d6d61a |
|
|
|
5d6d61a |
+ g_file_info_set_file_type (info, file_type);
|
|
|
5d6d61a |
if (file_type == G_FILE_TYPE_DIRECTORY)
|
|
|
5d6d61a |
{
|
|
|
5d6d61a |
icon = g_themed_icon_new ("folder");
|
|
|
5d6d61a |
--
|
|
|
5d6d61a |
1.8.1.5
|