|
8809
|
1 |
--- gnome-vfs-2.6.0/libgnomevfs/gnome-vfs-volume.c 2004-10-19 14:42:43.072945304 +0530
|
|
|
2 |
+++ gnome-vfs-2.6.0-new/libgnomevfs/gnome-vfs-volume.c 2004-10-19 14:42:25.243655768 +0530
|
|
|
3 |
@@ -251,7 +251,21 @@ gnome_vfs_volume_handles_trash (GnomeVFS
|
|
|
4 |
return FALSE;
|
|
|
5 |
}
|
|
|
6 |
if (volume->priv->filesystem_type != NULL) {
|
|
|
7 |
- return _gnome_vfs_filesystem_use_trash (volume->priv->filesystem_type);
|
|
|
8 |
+ GnomeVFSVolume *home_volume = NULL;
|
|
|
9 |
+
|
|
|
10 |
+ /* $HOME only will contain Trash folder. Get the volume
|
|
|
11 |
+ * corresponding to user's home directory
|
|
|
12 |
+ */
|
|
|
13 |
+ home_volume = gnome_vfs_volume_monitor_get_volume_for_path (gnome_vfs_get_volume_monitor (), g_get_home_dir ());
|
|
|
14 |
+
|
|
|
15 |
+ g_return_val_if_fail (home_volume != NULL, FALSE);
|
|
|
16 |
+
|
|
|
17 |
+ /* Does this volume contain the ~/.Trash folder? */
|
|
|
18 |
+ if (gnome_vfs_volume_compare (home_volume, volume) == 0) {
|
|
|
19 |
+ return _gnome_vfs_filesystem_use_trash (volume->priv->filesystem_type);
|
|
|
20 |
+ } else {
|
|
|
21 |
+ return FALSE;
|
|
|
22 |
+ }
|
|
|
23 |
}
|
|
|
24 |
return FALSE;
|
|
|
25 |
}
|