A pass at cleaning up the volume monitor. Made all the details of

	NautilusVolume private.

	* libnautilus-private/filesystem-attributes.xml: Changed the
	"description" string to be named "default_volume_name" and also
	marked it to be localized.

	* libnautilus-private/nautilus-file-utilities.h:
	* libnautilus-private/nautilus-file-utilities.c:
	(nautilus_get_data_file_path):
	Added a new utility function to locate a file that's either in the
	user's directory or in the Nautilus datadir.

	* src/nautilus-property-browser.c: (read_browser_xml): Use
	nautilus_get_data_file_path.

	* libnautilus-private/nautilus-trash-directory.c:
	(get_trash_volume):
	* libnautilus-private/nautilus-trash-monitor.c:
	(add_one_volume_trash):
	* src/file-manager/fm-desktop-icon-view.c: (volume_in_black_list),
	(create_unique_volume_name), (create_mount_link),
	(volume_unmounted_callback), (update_disks_menu):
	* src/nautilus-application.c: (volume_mounted_callback),
	(volume_unmounted_callback):
	* src/nautilus-bookmark-list.c:
	(nautilus_bookmark_list_get_file_path):
	Use only calls from the NautilusVolume public API -- no getting at
	the structure directly. Also fix callers that were using
	nautilus_volume_monitor_get_volume_mount_uri to correctly
	understand that they get the mount path, not the mount URI.

	* libnautilus-private/nautilus-volume-monitor.h:
	* libnautilus-private/nautilus-volume-monitor.c:
	(load_file_system_table): Fix storage leaks. Use the new
	nautilus_get_data_file_path. Translate the default volume names as
	they are loaded. Check for duplicate entries while loading the
	table. Don't bother checking the name of the root node, since
	there are plenty of other things about the file that we don't
	check and there's no reason we particularly need to check that.
	Fix some storage leaks. Free the doc, since I'm not seeing a
	"nautilus --quit" segfault.
	(nautilus_volume_monitor_initialize): Only initialize stuff that
	g_new0 won't set up for us.
	(nautilus_volume_is_removable): Rename so it's a call on
	NautilusVolume, not the NautilusVolumeMonitor.
	(volume_is_removable): Fix logic so we don't have to have so many
	different calls to fclose.
	(nautilus_volume_get_name): Rename so it's a call on
	NautilusVolume, not the NautilusVolumeMonitor.
	(modify_volume_name_for_display): Don't bother supplying a name if
	passed NULL, since that won't ever be helpful the way this is used.
	(nautilus_volume_get_target_uri): Rename so it's a call on
	NautilusVolume, not the NautilusVolumeMonitor.
	(nautilus_volume_should_integrate_trash): Rename so it's a call on
	NautilusVolume, not the NautilusVolumeMonitor. Get the information
	from the file system type, so we don't have to copy it into each
	NautilusVolume object.
	(nautilus_volume_get_mount_path): Rename so it's a call on
	NautilusVolume, and don't call it a URI since it's really a path.
	(nautilus_volume_get_device_type): New call.
	(make_volume_name_from_path): Get the default from the file system
	type rather than passing it in.
	(free_mount_list): Get rid of some dumb extra code.
	(copy_volume), (nautilus_volume_free): Update for smaller set of
	fields.
	(create_volume), (finish_creating_volume),
	(finish_creating_volume_and_prepend): Restructure so we don't need
	to keep so much stuff around in the NautilusVolume object.

	* src/nautilus-first-time-druid.c:
	(druid_set_first_time_file_flag): Some tiny tweaking.

1 files changed, 24 insertions, 25 deletions

diff --git a/libnautilus-private/filesystem-attributes.xml b/libnautilus-private/filesystem-attributes.xml
index 9e2907fb4..037aaff78 100644
--- a/libnautilus-private/filesystem-attributes.xml
+++ b/libnautilus-private/filesystem-attributes.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0"?>
 <FilesystemAttributes>
-    <filesystem name="affs" trash="no" description="affs"/>
-    <filesystem name="afs" trash="yes" description="AFS Network Volume"/>
-    <filesystem name="auto" trash="no" description="Auto-detected Volume"/>
-    <filesystem name="cdda" trash="no" description="CD Digital Audio"/>
-    <filesystem name="cdrom" trash="no" description="CDROM Drive"/>
-    <filesystem name="devfs" trash="no" description="Hardware Device Volume"/>
-    <filesystem name="ext2" trash="yes" description="Ext2 Linux Volume"/>
-    <filesystem name="ext3" trash="yes" description="Ext3 Linux Volume"/>
-    <filesystem name="fat" trash="yes" description="MSDOS Volume"/>
-    <filesystem name="iso9660" trash="no" description="CDROM Volume"/>
-    <filesystem name="hpfs" trash="no" description="Windows NT Volume"/>
-    <filesystem name="minix" trash="no" description="Minix Volume"/>
-    <filesystem name="msdos" trash="no" description="MSDOS Volume"/>
-    <filesystem name="nfs" trash="yes" description="NFS Network Volume"/>
-    <filesystem name="proc" trash="no" description="System Volume"/>
-    <filesystem name="reiserfs" trash="yes" description="ReiserFS Linux Volume"/>
-    <filesystem name="smb" trash="yes" description="Windows Fileshare Volume"/>
-    <filesystem name="udf" trash="no" description="DVD Volume"/>
-    <filesystem name="ufs" trash="yes" description="Solaris/BSD Volume"/>
-    <filesystem name="umsdos" trash="no" description="Enhanced DOS Volume"/>
-    <filesystem name="vfat" trash="yes" description="Windows Volume"/>
-    <filesystem name="xenix" trash="no" description="Xenix Volume"/>
-    <filesystem name="xfs" trash="yes" description="XFS Linux Volume"/>
-    <filesystem name="xiafs" trash="no" description="xiafs"/>
-    <filesystem name="unknown" trash="no" description="Unknown Filesystem"/>
+    <filesystem name="affs"     _default_volume_name="AFFS Volume"/>
+    <filesystem name="afs"      _default_volume_name="AFS Network Volume" trash="yes"/>
+    <filesystem name="auto"     _default_volume_name="Auto-detected Volume"/>
+    <filesystem name="cdda"     _default_volume_name="CD Digital Audio"/>
+    <filesystem name="cdrom"    _default_volume_name="CD-ROM Drive"/>
+    <filesystem name="devfs"    _default_volume_name="Hardware Device Volume"/>
+    <filesystem name="ext2"     _default_volume_name="Ext2 Linux Volume" trash="yes"/>
+    <filesystem name="ext3"     _default_volume_name="Ext3 Linux Volume" trash="yes"/>
+    <filesystem name="fat"      _default_volume_name="MSDOS Volume" trash="yes"/>
+    <filesystem name="iso9660"  _default_volume_name="CDROM Volume"/>
+    <filesystem name="hpfs"     _default_volume_name="Windows NT Volume"/>
+    <filesystem name="minix"    _default_volume_name="Minix Volume"/>
+    <filesystem name="msdos"    _default_volume_name="MSDOS Volume"/>
+    <filesystem name="nfs"      _default_volume_name="NFS Network Volume" trash="yes"/>
+    <filesystem name="proc"     _default_volume_name="System Volume"/>
+    <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/>
+    <filesystem name="smb"      _default_volume_name="Windows Shared Volume" trash="yes"/>
+    <filesystem name="udf"      _default_volume_name="DVD Volume"/>
+    <filesystem name="ufs"      _default_volume_name="Solaris/BSD Volume" trash="yes"/>
+    <filesystem name="umsdos"   _default_volume_name="Enhanced DOS Volume"/>
+    <filesystem name="vfat"     _default_volume_name="Windows VFAT Volume" trash="yes"/>
+    <filesystem name="xenix"    _default_volume_name="Xenix Volume"/>
+    <filesystem name="xfs"      _default_volume_name="XFS Linux Volume" trash="yes"/>
+    <filesystem name="xiafs"    _default_volume_name="XIAFS Volume"/>
 </FilesystemAttributes>