hal/hald/linux2 blockdev.c,1.5,1.6

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv1227/hald/linux2

Modified Files:
	blockdev.c 
Log Message:
2005-02-23  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/blockdev.c (force_unmount): Change to use new prototype
	for device_send_signal_condition

	* hald/hald_dbus.h: Adjust prototype for device_send_signal_condition

	* hald/hald_dbus.c (device_send_signal_condition): Change a Condition
	to not take an arbitrary message byt just a (name, details) tupple

	* hald/debug-hald.sh: Add some helpful instructions



Index: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blockdev.c	23 Feb 2005 03:03:12 -0000	1.5
+++ blockdev.c	23 Feb 2005 18:25:43 -0000	1.6
@@ -222,7 +222,7 @@
 	return;
 
 error:
-	HAL_INFO (("Couldn't find hal volume for %s", d->udi));
+	HAL_INFO (("Couldn't find hal volume for %s", sysfs_path));
 	;
 }
 
@@ -753,11 +753,7 @@
 			HAL_INFO (("Goint to emit VolumeUnmountForced('%s', '%s', TRUE)", device_file, device_mount_point));
 			device_send_signal_condition (d,
 						      "VolumeUnmountForced",
-						      DBUS_TYPE_STRING,
-						      device_file,
-						      DBUS_TYPE_STRING,
-						      device_mount_point,
-						      DBUS_TYPE_INVALID);
+						      device_file);
 		}
 	} else {
 		HAL_INFO (("Didn't want to unmount %s", device_file));