--- ./libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2004/10/22 01:54:48	1.1
+++ ./libgnomevfs/gnome-vfs-volume-monitor-daemon.c	2004/10/22 02:17:27
@@ -56,13 +56,8 @@ typedef struct {
 
 static GnomeVFSVolumeMonitorClass *parent_class = NULL;
 
-/* In the event we can't connect to the HAL daemon this boolean is TRUE
- * and we fall back to the usual fstab/mtab monitoring. 
- *
- * This is also useful for maintaing the non-HAL code on a system with
- * HAL installed.
- */
-static gboolean dont_use_hald = TRUE;
+/* Set to TRUE if we can connect to the HAL daemon. */
+static gboolean use_hald = FALSE;
 
 /* Locking strategy:
  *
@@ -156,19 +151,17 @@ gnome_vfs_volume_monitor_daemon_init (Gn
 #ifdef USE_HAL
 	if (_gnome_vfs_monitor_hal_mounts_init (volume_monitor_daemon)) {
 		/* It worked, do use HAL */
-		dont_use_hald = FALSE;
+		use_hald = TRUE;
 	} else {
 		/* Couldn't connect to HAL daemon, don't use HAL */
-		dont_use_hald = TRUE;
+		use_hald = FALSE;
 	}
 #endif /* USE_HAL */
 
-	if (dont_use_hald) {
-		_gnome_vfs_monitor_unix_mounts (fstab_changed,
-						volume_monitor_daemon,
-						mtab_changed,
-						volume_monitor_daemon);
-	}
+	_gnome_vfs_monitor_unix_mounts (fstab_changed,
+					volume_monitor_daemon,
+					mtab_changed,
+					volume_monitor_daemon);
 
 	volume_monitor_daemon->gconf_client = gconf_client_get_default ();
 	gconf_client_add_dir (volume_monitor_daemon->gconf_client,
@@ -185,12 +178,10 @@ gnome_vfs_volume_monitor_daemon_init (Gn
 					 NULL);
 								       
 	
-	if (dont_use_hald) {
-		update_fstab_drives (volume_monitor_daemon);
-		update_mtab_volumes (volume_monitor_daemon);
-	}
+	update_fstab_drives (volume_monitor_daemon);
+	update_mtab_volumes (volume_monitor_daemon);
 #ifdef USE_HAL
-	else {
+	if (use_hald) {
 		_gnome_vfs_monitor_hal_get_volume_list (volume_monitor_daemon);
 	}
 #endif /* USE_HAL */
@@ -205,12 +196,10 @@ gnome_vfs_volume_monitor_daemon_force_pr
 	
 	volume_monitor_daemon = GNOME_VFS_VOLUME_MONITOR_DAEMON (volume_monitor);
 	
-	if (dont_use_hald) {
-		update_fstab_drives (volume_monitor_daemon);
-		update_mtab_volumes (volume_monitor_daemon);
-	}
+	update_fstab_drives (volume_monitor_daemon);
+	update_mtab_volumes (volume_monitor_daemon);
 #ifdef USE_HAL
-	else {
+	if (use_hald) {
 		_gnome_vfs_monitor_hal_get_volume_list (volume_monitor_daemon);
 	}
 #endif /* USE_HAL */
@@ -226,19 +215,17 @@ gnome_vfs_volume_monitor_daemon_finalize
 
 	volume_monitor_daemon = GNOME_VFS_VOLUME_MONITOR_DAEMON (object);
 		
-	if (dont_use_hald) {
-		_gnome_vfs_stop_monitoring_unix_mounts ();
+	_gnome_vfs_stop_monitoring_unix_mounts ();
 
-		g_list_foreach (volume_monitor_daemon->last_mtab,
-				(GFunc)_gnome_vfs_unix_mount_free, NULL);
-		g_list_free (volume_monitor_daemon->last_mtab);
-	
-		g_list_foreach (volume_monitor_daemon->last_fstab,
-				(GFunc)_gnome_vfs_unix_mount_point_free, NULL);
-		g_list_free (volume_monitor_daemon->last_fstab);	
-	}
+	g_list_foreach (volume_monitor_daemon->last_mtab,
+			(GFunc)_gnome_vfs_unix_mount_free, NULL);
+	g_list_free (volume_monitor_daemon->last_mtab);
+
+	g_list_foreach (volume_monitor_daemon->last_fstab,
+			(GFunc)_gnome_vfs_unix_mount_point_free, NULL);
+	g_list_free (volume_monitor_daemon->last_fstab);	
 #ifdef USE_HAL
-	else {
+	if (use_hald) {
 		_gnome_vfs_monitor_hal_mounts_shutdown (volume_monitor_daemon);
 	}
 #endif /* USE_HAL */