From 720df6bf9da7a6f7765264deddfb977c9c86ebe8 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 7 Aug 2009 08:40:07 +0000
Subject: [PATCH] Fix for unmounting webdav shares. GNOME Bug #567664.

---
 x11/gnome/gvfs/Makefile                       |  4 +--
 .../patches/patch-daemon_gvfsbackenddav_c     | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 x11/gnome/gvfs/patches/patch-daemon_gvfsbackenddav_c

diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile
index 91093be71a6..fd8532db3fd 100644
--- a/x11/gnome/gvfs/Makefile
+++ b/x11/gnome/gvfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2009/07/21 09:19:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2009/08/07 08:40:07 ajacoutot Exp $
 
 COMMENT-main=		GNOME virtual file system
 COMMENT-smb=		samba module for GVFS
@@ -7,7 +7,7 @@ GNOME_PROJECT=		gvfs
 GNOME_VERSION=		1.0.3
 SHARED_LIBS +=	gvfscommon           1.0      # .0.0
 
-PKGNAME-main=		${DISTNAME}p6
+PKGNAME-main=		${DISTNAME}p7
 PKGNAME-smb=		${GNOME_PROJECT}-smb-${GNOME_VERSION}p3
 
 # LGPLv2
diff --git a/x11/gnome/gvfs/patches/patch-daemon_gvfsbackenddav_c b/x11/gnome/gvfs/patches/patch-daemon_gvfsbackenddav_c
new file mode 100644
index 00000000000..b2dea0ce55e
--- /dev/null
+++ b/x11/gnome/gvfs/patches/patch-daemon_gvfsbackenddav_c
@@ -0,0 +1,29 @@
+$OpenBSD: patch-daemon_gvfsbackenddav_c,v 1.1 2009/08/07 08:40:07 ajacoutot Exp $
+
+Fix unmounting webdav share:
+    http://bugzilla.gnome.org/show_bug.cgi?id=567664
+
+--- daemon/gvfsbackenddav.c.orig	Fri Aug  7 10:21:57 2009
++++ daemon/gvfsbackenddav.c	Fri Aug  7 10:23:13 2009
+@@ -2124,11 +2124,11 @@ do_set_display_name (GVfsBackend           *backend,
+   soup_uri_free (source);
+ }
+ 
+-static gboolean
+-try_unmount (GVfsBackend    *backend,
++static void 
++do_unmount (GVfsBackend    *backend,
+              GVfsJobUnmount *job)
+ {
+-  _exit (0);
++ g_vfs_job_succeeded (G_VFS_JOB (job));
+ }
+ 
+ /* ************************************************************************* */
+@@ -2156,5 +2156,5 @@ g_vfs_backend_dav_class_init (GVfsBackendDavClass *kla
+   backend_class->make_directory    = do_make_directory;
+   backend_class->delete            = do_delete;
+   backend_class->set_display_name  = do_set_display_name;
+-  backend_class->try_unmount       = try_unmount;
++  backend_class->unmount           = do_unmount;
+ }