hal/hald/linux osspec.c,1.29,1.30

[Joe Shaw]

Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv16448/hald/linux

Modified Files:
	osspec.c 
Log Message:
2004-07-30  Joe Shaw  <joeshaw at novell.com>

	* hald/hald.c (main): Update for the change to hald_dbus_init():
	don't get a DBusConnection from there, exit() if it fails.  Also
	update for the change to osspec_init(): don't pass in any
	arguments.

	* hald/hald_dbus.c (hald_dbus_init): Don't exit() anywhere here;
	instead return FALSE.  Tell dbus not to exit if we're disconnected
	from the bus.  Return TRUE on success, not a DBusConnection.
	(filter_function): Listen for the "Disconnected" signal on the
	"Local" dbus interface and if so, unref the connection and try to
	reconnect to the system bus every 3 seconds.
	(reinit_dbus): Try to reconnect to the system bus.

	* hald/osspec.h: Change osspec_init() to not take any parameters;
	the only backend (the Linux 2.6 one) wasn't using it.

	* hald/linux/osspec.c (osspec_init): Take void instead of a
	DBusConnection.

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- osspec.c	22 Jul 2004 19:06:01 -0000	1.29
+++ osspec.c	30 Jul 2004 17:00:42 -0000	1.30
@@ -310,7 +310,7 @@
 
 /* This function is documented in ../osspec.h */
 void
-osspec_init (DBusConnection * dbus_connection)
+osspec_init (void)
 {
 	int i;
 	int rc;