Revert "trash: Correctly determine fs type for paths with symlinks"

This reverts commit 6c0adcce5a3f5b784e198ce9cf2af6aaa540a264.

1 files changed, 16 insertions, 1 deletions

diff --git a/daemon/trashlib/trashwatcher.c b/daemon/trashlib/trashwatcher.c
index 5520eb57..f1196a3f 100644
--- a/daemon/trashlib/trashwatcher.c
+++ b/daemon/trashlib/trashwatcher.c
@@ -95,7 +95,22 @@ find_mount_entry_for_file (GFile *file)
   char *pathname;
 
   pathname = g_file_get_path (file);
-  entry = g_unix_mount_for (pathname, NULL);
+  do
+    {
+      char *slash;
+
+      slash = strrchr (pathname, '/');
+
+      /* leave the leading '/' in place */
+      if (slash == pathname)
+        slash++;
+
+      *slash = '\0';
+
+      entry = g_unix_mount_at (pathname, NULL);
+    }
+  while (entry == NULL && pathname[1]);
+
   g_free (pathname);
 
   /* if the GUnixMount stuff is gummed up, this might fail.  we can't