Require new gnome-vfs

2003-11-05  Alexander Larsson  <alexl@redhat.com>

	* configure.in:
	Require new gnome-vfs

	* components/tree/nautilus-tree-view.c:
	* libnautilus-private/nautilus-desktop-link-monitor.c:
	* libnautilus-private/nautilus-desktop-link.[ch]:
	* libnautilus-private/nautilus-monitor.c:
	* libnautilus-private/nautilus-trash-directory.c:
	* libnautilus-private/nautilus-trash-monitor.[ch]:
	* src/nautilus-application.c:
	Use gnome-vfs-volume-manager instead of nautilus-volume-manager.c

	* libnautilus-private/nautilus-desktop-icon-file.c:
	Set the volume on the nautilusfile

	* libnautilus-private/nautilus-directory-async.c:
	Load volume info from link

	* libnautilus-private/nautilus-file-attributes.h:
	* libnautilus-private/nautilus-mime-actions.c:
	Add new VOLUMES attribute

	* libnautilus-private/nautilus-file-private.h:
	Add has_volume and has_drive to NautilusFile

	* libnautilus-private/nautilus-file.[ch]:
	Add has_volume and has_drive to NautilusFile
	Volumes/drives are sorted separately

	* libnautilus-private/nautilus-link-desktop-file.[ch]:
	* libnautilus-private/nautilus-link.[ch]:
	Read drive and volume id from links

	* src/file-manager/fm-desktop-icon-view.c:
	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
	Remove volume ops. Remove disks menu

	* src/file-manager/fm-directory-view.c:
	* src/file-manager/nautilus-directory-view-ui.xml:
	Implement volume ops using gnome-vfs

	* src/file-manager/fm-properties-window.c:
	Handle drives/volumes

	* src/nautilus-window.c:
	Make a nicer title for some specific locations

	* libnautilus-private/nautilus-volume-monitor.[ch]:
	* libnautilus-private/Makefile.am
	remove this old crap

1 files changed, 12 insertions, 10 deletions

diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index cd2de5b22..da66ce6a6 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -28,11 +28,11 @@
 #include "nautilus-monitor.h"
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-utilities.h"
-#include "nautilus-volume-monitor.h"
 
 #include <libgnome/gnome-util.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 
 struct NautilusMonitor {
 	GnomeVFSMonitorHandle *handle;
@@ -69,17 +69,19 @@ nautilus_monitor_active (void)
 static gboolean
 path_is_on_readonly_volume (const char *path)
 {
-	NautilusVolumeMonitor *volume_monitor;
-	NautilusVolume *volume;
-
-	volume_monitor = nautilus_volume_monitor_get ();
-	volume = nautilus_volume_monitor_get_volume_for_path (volume_monitor, 
-							      path);
+	GnomeVFSVolumeMonitor *volume_monitor;
+	GnomeVFSVolume *volume;
+	gboolean res;
+
+	volume_monitor = gnome_vfs_get_volume_monitor ();
+	volume = gnome_vfs_volume_monitor_get_volume_for_path (volume_monitor, 
+							       path);
+	res = FALSE;
 	if (volume != NULL) {
-		return nautilus_volume_is_read_only (volume);
-	} else {
-		return FALSE;
+		res = gnome_vfs_volume_is_read_only (volume);
+		gnome_vfs_volume_unref (volume);
 	}
+	return res;
 }
 
 static gboolean call_consume_changes_idle_id = 0;