10139N/A--- /usr/tmp/clean/gvfs-1.5.5/daemon/trashlib/trashwatcher.c 2010-03-08 13:21:20.000000000 +0000

16398N/A+++ gvfs-1.5.5/daemon/trashlib/trashwatcher.c 2010-03-25 10:08:16.777306290 +0000

10139N/A@@ -255,9 +255,7 @@

10139N/A watcher->root = root;

10139N/A watcher->mounts = NULL;

10139N/A watcher->watching = FALSE;

15573N/A- watcher->mount_monitor = g_unix_mount_monitor_new ();

10139N/A- g_signal_connect_swapped (watcher->mount_monitor, "mounts_changed",

10139N/A- G_CALLBACK (trash_watcher_remount), watcher);

15291N/A+ watcher->mount_monitor = NULL;

16398N/A

10139N/A user_datadir = g_file_new_for_path (g_get_user_data_dir ());

10139N/A homedir_trashdir = g_file_get_child (user_datadir, "Trash/files");

10139N/A@@ -272,8 +270,6 @@

10139N/A g_object_unref (homedir_trashdir);

10139N/A g_object_unref (user_datadir);

10139N/A

10139N/A- trash_watcher_remount (watcher);

10139N/A-

10139N/A return watcher;

14355N/A }

10139N/A

14355N/A