summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--client/gvfsfusedaemon.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9beef42f..b8ba09f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-04-01 Hans Petter Jansson <hpj@novell.com>
+ * client/gvfsfusedaemon.c
+ (errno_from_error): Add G_IO_ERROR_WOULD_BLOCK -> EAGAIN mapping.
+
+2009-04-01 Hans Petter Jansson <hpj@novell.com>
+
Potential fix for bug #574968 - gvfs ftp backend appears to not wait
for ftpd return code on STOR.
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 2a87d357..e93a3073 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -165,6 +165,7 @@ errno_from_error (GError *error)
{ G_IO_ERROR_WRONG_ETAG, EIO },
{ G_IO_ERROR_TIMED_OUT, EIO },
{ G_IO_ERROR_BUSY, EBUSY },
+ { G_IO_ERROR_WOULD_BLOCK, EAGAIN },
{ -1, -1 }
};