Updated to 2.4.1

Changes:

* Handle cd volume names where the data track is not first
* Fix list view crash bug
* Fix shutdown crash bug
* Fix crash on unsupported URIs
* Don't show eraser in background browser
* Fix crash on going back when a view failed
* Don't show anything in views before all files are loaded.
* Make the desktop snap grid smaller vertically
* Fix accessibility crashers
* Double click on rows in tree sidebar expands rows
* portability and build fixes
* don't migrate .gnome-desktop if it is a symlink
* Fix messed up home/trash icons for new users
* Handle xpm icons correctly in desktop files
* Handle non-utf8 user names
* Fix warning on theme changes
* Sometimes the home and trash icons became blank and unusable
* Auto-hide KDE trash directory in desktop directory.
* Fix history sidepane crash
* Add keynav rectangle selection
* Better error string for missing proxy hostnames
* Handle arrow keys on numerical keypad

And more... review Changelog to see a full list of changes.

5 files changed, 31 insertions, 447 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index aedfdeb3ff5..33e8f6c4f00 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/14 23:09:02 xtraeme Exp $
 #
 
-DISTNAME=		nautilus-2.2.3.1
-PKGREVISION=		9
+DISTNAME=		nautilus-2.4.1
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -21,16 +20,7 @@ GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libnautilus/libnautilus.pc.in
 
-#
-# Nautilus has it's own idea of what versions of packages it wants, so make
-# it happy.
-#
-BUILDLINK_DEPENDS.esound=	esound>=0.2.27
-
-
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
 
 GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
 
@@ -50,26 +40,13 @@ CONF_FILES+=		${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
 .endfor
 .undef conffile
 
-pre-build:
-	for d in libnautilus libnautilus-adapter libnautilus-private src ; \
-	do								\
-		cd ${WRKSRC}/$$d &&					\
-		for x in *.idl ; do					\
-			${PREFIX}/bin/orbit-idl-2			\
-			    -I${LOCALBASE}/share/idl/bonobo-2.0		\
-			    -I${LOCALBASE}/share/idl/bonobo-activation-2.0 \
-			    -I..					\
-			    -D__nautilus_view_component_COMPILATION $$x ; \
-			${TOUCH} `${ECHO} $$x | ${SED} s/\.idl/_idl_stamp/\
-			    | ${SED} s/-/_/g` ;				\
-		done ;							\
-	done
-
 .include "../../devel/GConf2/schemas.mk"
+.include "../../devel/libgsf/buildlink2.mk"
 .include "../../devel/eel2/buildlink2.mk"
 .include "../../graphics/imlib2/buildlink2.mk"
 .include "../../graphics/librsvg2/buildlink2.mk"
 .include "../../sysutils/fam/buildlink2.mk"
 .include "../../textproc/intltool/buildlink2.mk"
 .include "../../x11/gnome-desktop/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index 71b0581d342..8c1126fa44c 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/27 16:05:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/14 23:09:02 xtraeme Exp $
 bin/nautilus
 bin/nautilus-file-management-properties
 bin/nautilus-server-connect
@@ -82,8 +82,10 @@ ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/nautilus.mo
@@ -99,15 +101,19 @@ ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/li/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/nautilus.mo
@@ -119,6 +125,8 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/nautilus.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/nautilus.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/nautilus.mo
@@ -183,166 +191,35 @@ share/pixmaps/nautilus/colors.png
 share/pixmaps/nautilus/cpu.png
 share/pixmaps/nautilus/crux_eggplant/Search.png
 share/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
-share/pixmaps/nautilus/crux_eggplant/decrement-i.png
-share/pixmaps/nautilus/crux_eggplant/decrement.png
-share/pixmaps/nautilus/crux_eggplant/increment-i.png
-share/pixmaps/nautilus/crux_eggplant/increment.png
-share/pixmaps/nautilus/crux_eggplant/number_strip.png
-share/pixmaps/nautilus/crux_eggplant/theme_preview.png
-share/pixmaps/nautilus/crux_eggplant/throbber/001.png
-share/pixmaps/nautilus/crux_eggplant/throbber/002.png
-share/pixmaps/nautilus/crux_eggplant/throbber/003.png
-share/pixmaps/nautilus/crux_eggplant/throbber/004.png
-share/pixmaps/nautilus/crux_eggplant/throbber/005.png
-share/pixmaps/nautilus/crux_eggplant/throbber/006.png
-share/pixmaps/nautilus/crux_eggplant/throbber/007.png
-share/pixmaps/nautilus/crux_eggplant/throbber/008.png
-share/pixmaps/nautilus/crux_eggplant/throbber/009.png
-share/pixmaps/nautilus/crux_eggplant/throbber/010.png
-share/pixmaps/nautilus/crux_eggplant/throbber/011.png
-share/pixmaps/nautilus/crux_eggplant/throbber/012.png
-share/pixmaps/nautilus/crux_eggplant/throbber/013.png
-share/pixmaps/nautilus/crux_eggplant/throbber/014.png
-share/pixmaps/nautilus/crux_eggplant/throbber/015.png
-share/pixmaps/nautilus/crux_eggplant/throbber/016.png
-share/pixmaps/nautilus/crux_eggplant/throbber/017.png
-share/pixmaps/nautilus/crux_eggplant/throbber/018.png
-share/pixmaps/nautilus/crux_eggplant/throbber/019.png
-share/pixmaps/nautilus/crux_eggplant/throbber/020.png
-share/pixmaps/nautilus/crux_eggplant/throbber/021.png
-share/pixmaps/nautilus/crux_eggplant/throbber/022.png
-share/pixmaps/nautilus/crux_eggplant/throbber/023.png
-share/pixmaps/nautilus/crux_eggplant/throbber/024.png
-share/pixmaps/nautilus/crux_eggplant/throbber/025.png
-share/pixmaps/nautilus/crux_eggplant/throbber/026.png
-share/pixmaps/nautilus/crux_eggplant/throbber/027.png
-share/pixmaps/nautilus/crux_eggplant/throbber/028.png
-share/pixmaps/nautilus/crux_eggplant/throbber/029.png
-share/pixmaps/nautilus/crux_eggplant/throbber/030.png
-share/pixmaps/nautilus/crux_eggplant/throbber/rest.png
-share/pixmaps/nautilus/crux_eggplant/zoom_body.png
 share/pixmaps/nautilus/crux_teal/Search.png
 share/pixmaps/nautilus/crux_teal/crux_teal.xml
-share/pixmaps/nautilus/crux_teal/decrement-i.png
-share/pixmaps/nautilus/crux_teal/decrement.png
-share/pixmaps/nautilus/crux_teal/increment-i.png
-share/pixmaps/nautilus/crux_teal/increment.png
-share/pixmaps/nautilus/crux_teal/number_strip.png
-share/pixmaps/nautilus/crux_teal/theme_preview.png
-share/pixmaps/nautilus/crux_teal/throbber/001.png
-share/pixmaps/nautilus/crux_teal/throbber/002.png
-share/pixmaps/nautilus/crux_teal/throbber/003.png
-share/pixmaps/nautilus/crux_teal/throbber/004.png
-share/pixmaps/nautilus/crux_teal/throbber/005.png
-share/pixmaps/nautilus/crux_teal/throbber/006.png
-share/pixmaps/nautilus/crux_teal/throbber/007.png
-share/pixmaps/nautilus/crux_teal/throbber/008.png
-share/pixmaps/nautilus/crux_teal/throbber/009.png
-share/pixmaps/nautilus/crux_teal/throbber/010.png
-share/pixmaps/nautilus/crux_teal/throbber/011.png
-share/pixmaps/nautilus/crux_teal/throbber/012.png
-share/pixmaps/nautilus/crux_teal/throbber/013.png
-share/pixmaps/nautilus/crux_teal/throbber/014.png
-share/pixmaps/nautilus/crux_teal/throbber/015.png
-share/pixmaps/nautilus/crux_teal/throbber/016.png
-share/pixmaps/nautilus/crux_teal/throbber/017.png
-share/pixmaps/nautilus/crux_teal/throbber/018.png
-share/pixmaps/nautilus/crux_teal/throbber/019.png
-share/pixmaps/nautilus/crux_teal/throbber/020.png
-share/pixmaps/nautilus/crux_teal/throbber/021.png
-share/pixmaps/nautilus/crux_teal/throbber/022.png
-share/pixmaps/nautilus/crux_teal/throbber/023.png
-share/pixmaps/nautilus/crux_teal/throbber/024.png
-share/pixmaps/nautilus/crux_teal/throbber/025.png
-share/pixmaps/nautilus/crux_teal/throbber/026.png
-share/pixmaps/nautilus/crux_teal/throbber/027.png
-share/pixmaps/nautilus/crux_teal/throbber/028.png
-share/pixmaps/nautilus/crux_teal/throbber/029.png
-share/pixmaps/nautilus/crux_teal/throbber/030.png
-share/pixmaps/nautilus/crux_teal/throbber/rest.png
-share/pixmaps/nautilus/crux_teal/zoom_body.png
-share/pixmaps/nautilus/decrement.png
 share/pixmaps/nautilus/default/Search.png
-share/pixmaps/nautilus/default/decrement.png
 share/pixmaps/nautilus/default/default.xml
-share/pixmaps/nautilus/default/increment.png
-share/pixmaps/nautilus/default/number_strip.png
 share/pixmaps/nautilus/default/side_bar_image.png
-share/pixmaps/nautilus/default/theme_preview.png
-share/pixmaps/nautilus/default/zoom_body.png
 share/pixmaps/nautilus/emblems.png
 share/pixmaps/nautilus/erase.png
 share/pixmaps/nautilus/gnome/Services.png
 share/pixmaps/nautilus/gnome/gnome.xml
-share/pixmaps/nautilus/gnome/theme_preview.png
-share/pixmaps/nautilus/gnome/throbber/001.png
-share/pixmaps/nautilus/gnome/throbber/002.png
-share/pixmaps/nautilus/gnome/throbber/003.png
-share/pixmaps/nautilus/gnome/throbber/004.png
-share/pixmaps/nautilus/gnome/throbber/005.png
-share/pixmaps/nautilus/gnome/throbber/006.png
-share/pixmaps/nautilus/gnome/throbber/rest.png
-share/pixmaps/nautilus/increment.png
 share/pixmaps/nautilus/knob.png
 share/pixmaps/nautilus/memory_chip.gif
 share/pixmaps/nautilus/nautilus-desktop.png
+share/pixmaps/nautilus/nautilus-file-management-properties.png
 share/pixmaps/nautilus/nautilus-launch-icon.png
 share/pixmaps/nautilus/nautilus-mini-logo.png
 share/pixmaps/nautilus/nautilus-server-connect.png
 share/pixmaps/nautilus/note-indicator.png
-share/pixmaps/nautilus/number_strip.png
 share/pixmaps/nautilus/side_bar_image.png
 share/pixmaps/nautilus/sierra/green_weave.png
-share/pixmaps/nautilus/sierra/number_strip.png
 share/pixmaps/nautilus/sierra/sierra.xml
-share/pixmaps/nautilus/sierra/theme_preview.png
 share/pixmaps/nautilus/tahoe/bluewall.png
-share/pixmaps/nautilus/tahoe/number_strip.png
 share/pixmaps/nautilus/tahoe/tahoe.xml
-share/pixmaps/nautilus/tahoe/theme_preview.png
 share/pixmaps/nautilus/text-selection-frame.png
-share/pixmaps/nautilus/throbber/001.png
-share/pixmaps/nautilus/throbber/002.png
-share/pixmaps/nautilus/throbber/003.png
-share/pixmaps/nautilus/throbber/004.png
-share/pixmaps/nautilus/throbber/005.png
-share/pixmaps/nautilus/throbber/006.png
-share/pixmaps/nautilus/throbber/007.png
-share/pixmaps/nautilus/throbber/008.png
-share/pixmaps/nautilus/throbber/009.png
-share/pixmaps/nautilus/throbber/010.png
-share/pixmaps/nautilus/throbber/011.png
-share/pixmaps/nautilus/throbber/012.png
-share/pixmaps/nautilus/throbber/013.png
-share/pixmaps/nautilus/throbber/014.png
-share/pixmaps/nautilus/throbber/015.png
-share/pixmaps/nautilus/throbber/016.png
-share/pixmaps/nautilus/throbber/017.png
-share/pixmaps/nautilus/throbber/018.png
-share/pixmaps/nautilus/throbber/019.png
-share/pixmaps/nautilus/throbber/020.png
-share/pixmaps/nautilus/throbber/021.png
-share/pixmaps/nautilus/throbber/022.png
-share/pixmaps/nautilus/throbber/023.png
-share/pixmaps/nautilus/throbber/024.png
-share/pixmaps/nautilus/throbber/025.png
-share/pixmaps/nautilus/throbber/026.png
-share/pixmaps/nautilus/throbber/027.png
-share/pixmaps/nautilus/throbber/028.png
-share/pixmaps/nautilus/throbber/029.png
-share/pixmaps/nautilus/throbber/030.png
-share/pixmaps/nautilus/throbber/rest.png
 share/pixmaps/nautilus/thumbnail_frame.png
-share/pixmaps/nautilus/zoom_body.png
-@dirrm share/pixmaps/nautilus/throbber
 @dirrm share/pixmaps/nautilus/tahoe
 @dirrm share/pixmaps/nautilus/sierra
-@dirrm share/pixmaps/nautilus/gnome/throbber
 @dirrm share/pixmaps/nautilus/gnome
 @dirrm share/pixmaps/nautilus/default
-@dirrm share/pixmaps/nautilus/crux_teal/throbber
 @dirrm share/pixmaps/nautilus/crux_teal
-@dirrm share/pixmaps/nautilus/crux_eggplant/throbber
 @dirrm share/pixmaps/nautilus/crux_eggplant
 @dirrm share/pixmaps/nautilus
 @dirrm share/nautilus/services/text
diff --git a/sysutils/nautilus/buildlink2.mk b/sysutils/nautilus/buildlink2.mk
index 9bfcd03ec49..2a0c7395859 100644
--- a/sysutils/nautilus/buildlink2.mk
+++ b/sysutils/nautilus/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/12/13 00:45:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/14 23:09:02 xtraeme Exp $
 #
 # This Makefile fragment is included by packages that use nautilus.
 #
@@ -9,7 +9,7 @@
 NAUTILUS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			nautilus
-BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.2.3.1nb9
+BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.4.1
 BUILDLINK_PKGSRCDIR.nautilus?=		../../sysutils/nautilus
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.nautilus=nautilus
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 187df0fe41f..ae6a88dee3e 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2003/05/04 01:10:57 rh Exp $
+$NetBSD: distinfo,v 1.4 2003/12/14 23:09:02 xtraeme Exp $
 
-SHA1 (nautilus-2.2.3.1.tar.bz2) = 1e2055d4a6b9e35c2bc08a017a77601f7fc5074e
-Size (nautilus-2.2.3.1.tar.bz2) = 4558276 bytes
+SHA1 (nautilus-2.4.1.tar.bz2) = b8670ab9499eaff54c265cabb6736a742691084b
+Size (nautilus-2.4.1.tar.bz2) = 5573224 bytes
 SHA1 (patch-aa) = 334a3c4b4fe5b93c817f04c2de1f130ad7b17592
 SHA1 (patch-ab) = 38390bb0d8b705f561f8e2d30a323b78a982a777
 SHA1 (patch-ac) = ee6b0d6df93fa3aa44ab86754322067f586dd0e2
-SHA1 (patch-ad) = b994f9e62aef5794ef7caf3f4da1335dac681e28
+SHA1 (patch-ad) = bd54cbe0abb49ce52288e9f5bea51ddea9ff5481
 SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124
 SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
diff --git a/sysutils/nautilus/patches/patch-ad b/sysutils/nautilus/patches/patch-ad
index 33c59596eff..095faa20907 100644
--- a/sysutils/nautilus/patches/patch-ad
+++ b/sysutils/nautilus/patches/patch-ad
@@ -1,282 +1,12 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
+$NetBSD: patch-ad,v 1.2 2003/12/14 23:09:02 xtraeme Exp $
 
---- libnautilus-private/nautilus-volume-monitor.c.orig	2003-03-01 01:15:00.000000000 +1000
-+++ libnautilus-private/nautilus-volume-monitor.c
-@@ -59,6 +59,17 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
+--- libnautilus-private/nautilus-volume-monitor.c.orig	2003-10-26 05:00:57.000000000 +0000
++++ libnautilus-private/nautilus-volume-monitor.c	2003-10-26 05:04:17.000000000 +0000
+@@ -55,6 +55,7 @@
+ #include <pthread.h>
+ #include <stdio.h>
+ #include <stdlib.h>
 +#include <sys/param.h>
-+#if (defined(BSD) && BSD >= 199306)
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+#define HAVE_SETFSENT
-+#define HAVE_FSTAB_H
-+#define BSD_MNT
-+#define setmntent(f,m) setfsent()
-+#endif
-+
- #ifdef HAVE_SYS_VFSTAB_H
- #include <sys/vfstab.h>
- #else
-@@ -103,7 +114,7 @@
- #define MNTOPT_RO "ro"
- #endif
- 
--#ifndef HAVE_SETMNTENT
-+#if !defined(HAVE_SETMNTENT) &&  !defined(HAVE_SETFSENT)
- #define setmntent(f,m) fopen(f,m)
- #endif
- 
-@@ -492,6 +503,9 @@ nautilus_volume_monitor_get_volume_for_p
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#if (defined(BSD) && BSD >= 199306)
-+    	struct fstab *fsent;
-+#endif
- #ifdef HAVE_HASMNTOPT
- 	/* Use "owner" or "user" or "users" as our way of determining a removable volume */
- 	if (hasmntopt (ent, "user") != NULL
-@@ -501,6 +515,12 @@ has_removable_mntent_options (MountTable
- 		return TRUE;
- 	}
- #endif
-+#if (defined(BSD) && BSD >= 199306)
-+	fsent = getfsspec(ent->f_mntfromname);
-+	if (fsent != NULL && strstr (fsent->fs_mntops, "noauto")) {
-+	    	return TRUE;
-+	}
-+#endif
- 
- #ifdef SOLARIS_MNT
- 	if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
-@@ -522,10 +542,15 @@ has_removable_mntent_options (MountTable
- static GList *
- get_removable_volumes (NautilusVolumeMonitor *monitor)
- {
-+#ifndef HAVE_SETFSENT
- 	FILE *file;
--	GList *volumes;
--	MountTableEntry *ent;
--	NautilusVolume *volume;
-+#else
-+	int file;
-+	struct fstab *fsent;
-+#endif
-+	GList *volumes = NULL;
-+	MountTableEntry *ent = NULL;
-+	NautilusVolume *volume = NULL;
- 	char * fs_opt;
- #ifdef HAVE_SYS_MNTTAB_H
-         MountTableEntry ent_storage;
-@@ -533,26 +558,27 @@ get_removable_volumes (NautilusVolumeMon
- #ifdef HAVE_GETMNTINFO
- 	int count, index;
- #endif
--	ent = NULL;
--	volume = NULL;
--	volumes = NULL;
- 
- #ifdef HAVE_GETMNTINFO
- 	count = getmntinfo (&ent, MNT_WAIT);
- 	/* getmentinfo returns a pointer to static data. Do not free. */
- 	for (index = 0; index < count; index++) {
--		if (has_removable_mntent_options (&ent[index])) {
-+		if (has_removable_mntent_options (ent + index)) {
- 			volume = create_volume (ent[index].f_mntfromname,
- 						ent[index].f_mntonname);
- 			volume->is_removable = TRUE;
- 			volumes = finish_creating_volume_and_prepend
--				(monitor, volume, ent[index].f_fstypename, volumes);
-+		    		(monitor, volume, ent[index].f_fstypename, volumes);
- 		}
- 	}
- #endif
- 	
- 	file = setmntent (MOUNT_TABLE_PATH, "r");
-+#ifndef HAVE_SETFSENT
- 	if (file == NULL) {
-+#else
-+	if (file == 0) {
-+#endif
- 		return NULL;
- 	}
- 	
-@@ -587,9 +613,21 @@ get_removable_volumes (NautilusVolumeMon
- 				(monitor, volume, ent->mnt_type, volumes);
- 		}
- 	}
-+#elif defined (HAVE_SETFSENT)
-+	while ((fsent = getfsent ()) != NULL) {
-+	    	if (strstr (fsent->fs_mntops, "noauto") != NULL) {
-+		    	volume = create_volume (fsent->fs_spec, fsent->fs_file);
-+			volumes = finish_creating_volume_and_prepend
-+				(monitor, volume, fsent->fs_vfstype, volumes);
-+		}
-+	}
- #endif
--			
-+
-+#ifndef HAVE_SETFSENT
- 	fclose (file);
-+#else
-+	endfsent();
-+#endif
- 	
- #ifdef HAVE_CDDA
- 	volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
-@@ -619,7 +657,7 @@ entry_is_supermounted_volume (const Moun
-       return result;
- }
- 
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
- 
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
-@@ -963,23 +1001,34 @@ build_volume_list_delta (GList *list_one
- 
- 
- 
--#ifdef SOLARIS_MNT
-+#if defined(SOLARIS_MNT) || defined(BSD_MNT)
- 
- static GList *
- get_mount_list (NautilusVolumeMonitor *monitor) 
- {
--        FILE *fh;
-         GList *volumes;
-+#ifndef HAVE_SETFSENT
-         MountTableEntry ent;
-+	FILE *fh;
-+#else
-+        MountTableEntry *ent;
-+	int fh, index;
-+#endif
-         NautilusVolume *volume;
- 
- 	volumes = NULL;
-         
-+#ifndef HAVE_SETFSENT
- 	fh = setmntent (MOUNT_TABLE_PATH, "r");
- 	if (fh == NULL) {
-+#else
-+        fh = getmntinfo (&ent, MNT_WAIT);
-+	if (fh == 0) {
-+#endif
- 		return NULL;
- 	}
- 
-+#ifndef HAVE_SETFSENT
-         while (! getmntent(fh, &ent)) {
-                 volume = create_volume (ent.mnt_special, ent.mnt_mountp);
-                 volume->is_removable = has_removable_mntent_options (&ent);
-@@ -988,6 +1037,16 @@ get_mount_list (NautilusVolumeMonitor *m
-         }
- 
- 	fclose (fh);
-+#else
-+        /* getmentinfo returns a pointer to static data. Do not free. */
-+        for (index = 0; index < fh; index++) {
-+		volume = create_volume (ent[index].f_mntfromname,
-+					ent[index].f_mntonname);
-+                volume->is_removable = has_removable_mntent_options (ent + index);
-+                volumes = finish_creating_volume_and_prepend
-+					(monitor, volume, ent[index].f_fstypename, volumes);
-+        }
-+#endif
- 
-         return volumes;
- }
-@@ -1214,9 +1273,59 @@ mount_volumes_check_status (NautilusVolu
- static int
- get_cdrom_type (const char *vol_dev_path, int* fd)
- {
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
- 	*fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
- 	return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-+#elif defined(BSD_MNT)
-+#ifdef CDIOREADTOCENTRYS
-+       struct cd_toc_entry cdentry;
-+       struct ioc_read_toc_entry entry;
-+#else
-+       struct ioc_read_toc_single_entry entry;
-+#endif
-+       struct ioc_toc_header header;
-+       int type;
-+
-+       *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+       if (*fd < 0) {
-+               return CDS_DATA_1;
-+       }
-+
-+       if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
-+               return CDS_DATA_1;
-+       }
-+
-+       type = CDS_DATA_1;
-+
-+#ifdef CDIOREADTOCENTRYS
-+       for (entry.starting_track = header.starting_track;
-+            entry.starting_track <= header.ending_track;
-+            entry.starting_track++) {
-+		entry.address_format = CD_LBA_FORMAT;
-+		entry.data_len = sizeof cdentry;
-+		entry.data = &cdentry;
-+		if (ioctl (*fd, CDIOREADTOCENTRYS, &entry) == 0) {
-+			if (cdentry.control & CDROM_DATA_TRACK) {
-+				type = CDS_AUDIO;
-+				break;
-+			}
-+		}
-+	}
-+#else
-+       for (entry.track = header.starting_track;
-+            entry.track <= header.ending_track;
-+            entry.track++) {
-+           entry.address_format = CD_LBA_FORMAT;
-+           if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
-+                   if (entry.entry.control & CDROM_DATA_TRACK) {
-+                       type = CDS_AUDIO;
-+                       break;
-+                   }
-+           }
-+       }
-+#endif /* defined CDIOREADTOCENTRYS */
-+
-+       return type;
- #else
- 	GString *new_dev_path;
- 	struct cdrom_tocentry entry;
-@@ -1768,7 +1877,7 @@ load_additional_mount_list_info (GList *
- 	for (node = volume_list; node != NULL; node = node->next) {
- 		volume = node->data;
- 		
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
- 		/* These are set up by get_current_mount_list for Solaris. */
- 		volume->is_removable = volume_is_removable (volume);
- #endif
-@@ -1797,7 +1906,7 @@ finish_creating_volume (NautilusVolumeMo
- 		ok = mount_volume_auto_add (volume);
- 	} else if (strcmp (file_system_type_name, "cdda") == 0) {
- 		ok = mount_volume_cdda_add (volume);
--	} else if (strcmp (file_system_type_name, "iso9660") == 0) {
-+	} else if (strcmp (file_system_type_name, "cd9660") == 0) {
- 		ok = mount_volume_iso9660_add (volume);
- 	} else if (strcmp (file_system_type_name, "nfs") == 0) {
- 		ok = mount_volume_nfs_add (volume);
-@@ -1835,8 +1944,8 @@ finish_creating_volume (NautilusVolumeMo
- 	} else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) {
-                 volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
-                 volume->is_removable = TRUE;
--	} else if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {		
--		name = volume->mount_path + strlen ("/mnt/");
-+	} else if (eel_str_has_prefix (volume->mount_path, "/")) {		
-+		name = volume->mount_path + strlen ("/");
- 		
- 		if (eel_str_has_prefix (name, "cdrom")
- 				|| eel_str_has_prefix (name, "burn")) {
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>