gvfs r2230 - in trunk: . daemon/trashlib

[ryanl svn gnome org]

Author: ryanl
Date: Tue Feb 17 21:11:28 2009
New Revision: 2230
URL: http://svn.gnome.org/viewvc/gvfs?rev=2230&view=rev

Log:
2009-02-17  Ryan Lortie  <desrt desrt ca>

        * daemon/trashlib/trashwatcher.c: rescan NFS mounts when enumerating
        trash (since not all change events are reported).



Modified:
   trunk/ChangeLog
   trunk/daemon/trashlib/trashwatcher.c

Modified: trunk/daemon/trashlib/trashwatcher.c
==============================================================================
--- trunk/daemon/trashlib/trashwatcher.c	(original)
+++ trunk/daemon/trashlib/trashwatcher.c	Tue Feb 17 21:11:28 2009
@@ -65,7 +65,14 @@
 decide_watch_type (GUnixMountEntry *mount,
                    gboolean         is_home_trash)
 {
-  return TRASH_WATCHER_TRUSTED;
+  const gchar *fs_type;
+
+  fs_type = g_unix_mount_get_fs_type (mount);
+
+  if (strcmp (fs_type, "nfs") == 0)
+    return TRASH_WATCHER_WATCH;
+  else
+    return TRASH_WATCHER_TRUSTED;
 }
 
 /* find the mount entry for the directory containing 'file'.