From aa8fd4970a4b069087f1b92ae50ab7f940d783b5 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Jun 24 2008 11:56:46 +0000
Subject: - gvfsd-trash: Skip autofs mounts


---

diff --git a/gvfs-0.2.4-trash-automount.patch b/gvfs-0.2.4-trash-automount.patch
new file mode 100644
index 0000000..da97d9e
--- /dev/null
+++ b/gvfs-0.2.4-trash-automount.patch
@@ -0,0 +1,13 @@
+--- gvfs-0.2.4-orig/daemon/gvfsbackendtrash.c	2008-05-26 17:54:32.000000000 -0400
++++ gvfs-0.2.4/daemon/gvfsbackendtrash.c	2008-06-20 11:18:45.000000000 -0400
+@@ -538,6 +538,10 @@
+     {
+       mount = l->data;
+       
++      /* Skip autofs filesystem types: the root cannot contain .Trash */
++      if (strcmp ("autofs", g_unix_mount_get_fs_type (mount)) == 0)
++        continue;
++
+       topdir = g_unix_mount_get_mount_path (mount);
+       topdirs = g_list_prepend (topdirs, g_strdup (topdir));
+       
diff --git a/gvfs.spec b/gvfs.spec
index 5d871f5..c7e6bd9 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -47,6 +47,8 @@ Patch5: gvfs-obexftp-fallback-icon.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=522933
 Patch6: gvfs-ftp-read-directory-2.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=525779
+Patch7: gvfs-0.2.4-trash-automount.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -81,6 +83,7 @@ to access the gvfs filesystems.
 %patch4 -p1 -b .debug
 %patch5 -p0 -b .obexftp
 %patch6 -p0 -b .recurse
+%patch7 -p1 -b .trash
 
 
 %build
@@ -196,6 +199,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Tue Jun 24 2008 Tomas Bzatek <tbzatek@redhat.com> - 0.2.4-5
+- gvfsd-trash: Skip autofs mounts
+
 * Tue Jun 10 2008 Tomas Bzatek <tbzatek@redhat.com> - 0.2.4-4
 - Minor fixes to the last FTP patch