Re: [Nautilus-list] Re: bugs with trash that would also happen with magic desktop URIs

[Alex Larsson <alexl redhat com>]

On Wed, 11 Jul 2001, Alex Larsson wrote:

> On Wed, 11 Jul 2001, Darin Adler wrote:
>
> > Sorry, I don't get what you're saying here. The "trash:" URI is
> > implemented in a quite-different way.
> Yeah. I've noticed that now.
>
> > You're saying that when you copy new files into the trash they don't
> > appear in a "trash:" window? I'm pretty sure I've tested this in the past.
> That is exactly what I'm seeing. When dropping a file from a non-nfs
> directory to a window with thrash it doesn't show up. (Using fam)
>
> >   Could you write a bug report about the specific trash problem you've
> > encountered?
> I will, after i investigate it closer.

Sorry about the mis-report, the actual reason was that trash didn't work
on ext3 filesystems.

Here is a patch that fixes it, can i apply it?

/ Alex

Index: libnautilus-private/nautilus-volume-monitor.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-volume-monitor.c,v
retrieving revision 1.92
diff -u -p -r1.92 nautilus-volume-monitor.c
--- libnautilus-private/nautilus-volume-monitor.c	2001/07/02 15:55:02	1.92
+++ libnautilus-private/nautilus-volume-monitor.c	2001/07/11 22:09:07
@@ -624,6 +624,7 @@ nautilus_volume_monitor_get_target_uri (
 	case NAUTILUS_VOLUME_AUTO:
 	case NAUTILUS_VOLUME_CDROM:
 	case NAUTILUS_VOLUME_EXT2:
+	case NAUTILUS_VOLUME_EXT3:
 	case NAUTILUS_VOLUME_FAT:
 	case NAUTILUS_VOLUME_HPFS:
 	case NAUTILUS_VOLUME_HSFS:
@@ -658,6 +659,7 @@ nautilus_volume_monitor_should_integrate
 	 */
 	switch (volume->volume_type) {
 	case NAUTILUS_VOLUME_EXT2:
+	case NAUTILUS_VOLUME_EXT3:
 	case NAUTILUS_VOLUME_FAT:
 	case NAUTILUS_VOLUME_NFS:
 	case NAUTILUS_VOLUME_REISER:
@@ -773,6 +775,9 @@ mount_volume_make_name (NautilusVolume *

 	case NAUTILUS_VOLUME_EXT2:
 		return make_volume_name_from_path (volume, _("Ext2 Volume"));
+
+	case NAUTILUS_VOLUME_EXT3:
+		return make_volume_name_from_path (volume, _("Ext3 Volume"));

 	case NAUTILUS_VOLUME_FAT:
 	case NAUTILUS_VOLUME_VFAT:
@@ -855,6 +860,7 @@ mount_volume_deactivate (NautilusVolumeM
 	case NAUTILUS_VOLUME_AUTO:
 	case NAUTILUS_VOLUME_CDDA:
 	case NAUTILUS_VOLUME_EXT2:
+	case NAUTILUS_VOLUME_EXT3:
 	case NAUTILUS_VOLUME_FAT:
 	case NAUTILUS_VOLUME_HPFS:
 	case NAUTILUS_VOLUME_MINIX:
@@ -1157,6 +1163,13 @@ mount_volume_ext2_add (NautilusVolume *v
 }

 static gboolean
+mount_volume_ext3_add (NautilusVolume *volume)
+{
+	volume->volume_type = NAUTILUS_VOLUME_EXT3;
+	return TRUE;
+}
+
+static gboolean
 mount_volume_udf_add (NautilusVolume *volume)
 {
 	volume->volume_type = NAUTILUS_VOLUME_UDF;
@@ -1834,6 +1847,8 @@ mount_volume_prepend_filesystem (GList *
 		added = mount_volume_hsfs_add (volume);
 	} else if (strcmp (volume->filesystem, "ext2") == 0) {
 		added = mount_volume_ext2_add (volume);
+	} else if (strcmp (volume->filesystem, "ext3") == 0) {
+		added = mount_volume_ext3_add (volume);
 	} else if (strcmp (volume->filesystem, "fat") == 0) {
 		added = mount_volume_fat_add (volume);
 	} else if (strcmp (volume->filesystem, "hpfs") == 0) {
Index: libnautilus-private/nautilus-volume-monitor.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-volume-monitor.h,v
retrieving revision 1.30
diff -u -p -r1.30 nautilus-volume-monitor.h
--- libnautilus-private/nautilus-volume-monitor.h	2001/07/02 15:55:02	1.30
+++ libnautilus-private/nautilus-volume-monitor.h	2001/07/11 22:09:07
@@ -63,6 +63,7 @@ typedef enum {
 	NAUTILUS_VOLUME_CDDA,
 	NAUTILUS_VOLUME_CDROM,
 	NAUTILUS_VOLUME_EXT2,
+	NAUTILUS_VOLUME_EXT3,
 	NAUTILUS_VOLUME_FAT,
 	NAUTILUS_VOLUME_HPFS,
 	NAUTILUS_VOLUME_HSFS,