hal/hald hald_dbus.c,1.25,1.26

[David Zeuthen]

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

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

	* hald/linux2/osspec.c: Use kernel events layer instead of D_NOTIFY
	on /etc/mtab. Yay!

	* hald/linux2/blockdev.c (update_mount_point): Use /proc/mounts as
	we're now using the kernel events layer to get mount/umount signals
	rather than waiting for /etc/mtab to be changed. Otherwise we've
	would have a race with mount(1). Add some usable debug information.
	(blockdev_mount_status_changed): Renamed from blockdev_mtab_changed.

	* hald/hald_dbus.c (device_send_signal_property_modified): Yikes,
	append to the right iterator; fixes segfault



Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- hald_dbus.c	22 Feb 2005 18:46:56 -0000	1.25
+++ hald_dbus.c	23 Feb 2005 03:03:12 -0000	1.26
@@ -2000,14 +2000,13 @@
 						  NULL,
 						  &iter_struct);
 		
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &key);
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &removed);
-		dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &added);
+		dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &key);
+		dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_BOOLEAN, &removed);
+		dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_BOOLEAN, &added);
 
 		dbus_message_iter_close_container (&iter_array, &iter_struct);
 		dbus_message_iter_close_container (&iter, &iter_array);
 
-
 		if (!dbus_connection_send (dbus_connection, message, NULL))
 			DIE (("error broadcasting message"));