Bug 525779: Dont look for trashs dir on sys mounts

Don't include internal mountswhile building up the list of trash
directories. Bug #525779

svn path=/trunk/; revision=1852

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e9ab0e5..43f10bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-02  Christian Kellner  <gicmo@gnome.org>
 
+	* daemon/gvfsbackendtrash.c: Don't include internal mounts
+	while building up the list of trash directories. Bug #525779
+	Patcg from A. Walton  <awalton@svn.gnome.org>
+
+2008-08-02  Christian Kellner  <gicmo@gnome.org>
+
 	* daemon/gvfsbackenddav.c: (parse_xml): Free the xml doc in
 	error cases. Plug the leaks, fix bug #545968, thanks to
 	Christian Persch <chpe@gnome.org> again!
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 3a4a9b26..be3dd961 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -572,8 +572,11 @@ list_trash_dirs (void)
     {
       mount = l->data;
       
-      topdir = g_unix_mount_get_mount_path (mount);
-      topdirs = g_list_prepend (topdirs, g_strdup (topdir));
+      if (!g_unix_mount_is_system_internal (mount) )
+        {
+          topdir = g_unix_mount_get_mount_path (mount);
+          topdirs = g_list_prepend (topdirs, g_strdup (topdir));
+        }
       
       g_unix_mount_free (mount);
     }