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, 20 insertions, 38 deletions

diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 251575d6b..53dbc14c2 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -242,48 +242,30 @@ nautilus_link_local_is_utf8 (const char *uri,
 	}
 }
 
-char *
-nautilus_link_get_link_uri_given_file_contents (const char *uri,
-						const char *file_contents,
-						int file_size)
-{
-	switch (get_link_style_for_data (file_contents, file_size)) {
-	case desktop:
-		return nautilus_link_desktop_file_get_link_uri_given_file_contents (uri, file_contents, file_size);
-	case historical:
-		return nautilus_link_historical_get_link_uri_given_file_contents (file_contents, file_size);
-	default:
-		return NULL;
-	}
-}
-
-char *
-nautilus_link_get_link_name_given_file_contents (const char *uri,
-						 const char *file_contents,
-						 int file_size)
-{
-	switch (get_link_style_for_data (file_contents, file_size)) {
-	case desktop:
-		return nautilus_link_desktop_file_get_link_name_given_file_contents (uri, file_contents, file_size);
-	case historical:
-		return NULL;
-	default:
-		return NULL;
-	}
-}
-
-char *
-nautilus_link_get_link_icon_given_file_contents (const char *uri,
-						 const char *file_contents,
-						 int file_size)
+void
+nautilus_link_get_link_info_given_file_contents (const char       *file_contents,
+						 int               link_file_size,
+						 char            **uri,
+						 char            **name,
+						 char            **icon,
+						 gulong           *drive_id,
+						 gulong           *volume_id)
 {
-	switch (get_link_style_for_data (file_contents, file_size)) {
+	*uri = NULL;
+	*name = NULL;
+	*icon = NULL;
+	*drive_id = 0;
+	*volume_id = 0;
+	
+	switch (get_link_style_for_data (file_contents, link_file_size)) {
 	case desktop:
-		return nautilus_link_desktop_file_get_link_icon_given_file_contents (uri, file_contents, file_size);
+		return nautilus_link_desktop_file_get_link_info_given_file_contents (file_contents, link_file_size, uri, name, icon, drive_id, volume_id);
 	case historical:
-		return nautilus_link_historical_get_link_icon_given_file_contents (file_contents, file_size);
+		*uri = nautilus_link_historical_get_link_uri_given_file_contents (file_contents, link_file_size);
+		*icon = nautilus_link_historical_get_link_icon_given_file_contents (file_contents, link_file_size);
+		break;
 	default:
-		return NULL;
+		return;
 	}
 }