hal/hald debug-hald.sh, 1.1, 1.2 hald_dbus.c, 1.26, 1.27 hald_dbus.h, 1.5, 1.6

[David Zeuthen]

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

Modified Files:
	debug-hald.sh hald_dbus.c hald_dbus.h 
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: debug-hald.sh
===================================================================
RCS file: /cvs/hal/hal/hald/debug-hald.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug-hald.sh	10 Feb 2005 17:03:57 -0000	1.1
+++ debug-hald.sh	23 Feb 2005 18:25:43 -0000	1.2
@@ -2,5 +2,8 @@
 
 export PATH=linux2:linux2/probing:linux2/addons:.:../tools:$PATH
 export HAL_FDI_SOURCE=../fdi
+echo ========================================
+echo Just type \'run\' to start debugging hald
+echo ========================================
 gdb run --args ./hald --daemon=no --verbose=yes --retain-privileges
 

Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- hald_dbus.c	23 Feb 2005 03:03:12 -0000	1.26
+++ hald_dbus.c	23 Feb 2005 18:25:43 -0000	1.27
@@ -2034,13 +2034,11 @@
  *                              DBUS_TYPE_INVALID
  */
 void
-device_send_signal_condition (HalDevice *device, const char *condition_name,
-			      int first_arg_type, ...)
+device_send_signal_condition (HalDevice *device, const char *condition_name, const char *condition_details)
 {
 	const char *udi = hal_device_get_udi (device);
 	DBusMessage *message;
 	DBusMessageIter iter;
-	va_list var_args;
 
 	message = dbus_message_new_signal (udi,
 					   "org.freedesktop.Hal.Device",
@@ -2049,11 +2047,9 @@
 	dbus_message_iter_append_basic (&iter, 
 	                                DBUS_TYPE_STRING, 
 	                                &condition_name);
-
-	va_start (var_args, first_arg_type);
-	dbus_message_append_args_valist (message, first_arg_type,
-					 var_args);
-	va_end (var_args);
+	dbus_message_iter_append_basic (&iter, 
+	                                DBUS_TYPE_STRING, 
+	                                &condition_details);
 
 	if (!dbus_connection_send (dbus_connection, message, NULL))
 		DIE (("error broadcasting message"));

Index: hald_dbus.h
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- hald_dbus.h	31 Jan 2005 20:06:39 -0000	1.5
+++ hald_dbus.h	23 Feb 2005 18:25:43 -0000	1.6
@@ -82,7 +82,7 @@
 					   dbus_bool_t added);
 void device_send_signal_condition (HalDevice *device,
 				   const char *condition_name,
-				   int first_arg_type, ...);
+				   const char *condition_details);
 
 void device_property_atomic_update_begin (void);
 void device_property_atomic_update_end   (void);