hal/libhal libhal.c,1.30,1.31

David Zeuthen david at freedesktop.org
Sat Oct 2 09:26:14 PDT 2004


Update of /cvs/hal/hal/libhal
In directory gabe:/tmp/cvs-serv19742/libhal

Modified Files:
	libhal.c 
Log Message:
2004-10-02  David Zeuthen  <david at fubar.dk>

	* libhal/libhal.c (hal_initialize): Don't set is_shutdown when we're
	just initialized.
	(hal_get_all_devices): Set num_devices to 0 even if we fail. Patch
	from Colin Walters <walters at redhat.com>



Index: libhal.c
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- libhal.c	27 Sep 2004 16:37:47 -0000	1.30
+++ libhal.c	2 Oct 2004 16:26:12 -0000	1.31
@@ -671,8 +671,6 @@
 	}
 
 	ctx->is_initialized = TRUE;
-	ctx->is_shutdown = TRUE;
-
 	return ctx;
 }
 
@@ -744,6 +742,8 @@
 	char **device_names;
 	char **hal_device_names;
 
+	*num_devices = 0;
+
 	message = dbus_message_new_method_call ("org.freedesktop.Hal",
 						"/org/freedesktop/Hal/Manager",
 						"org.freedesktop.Hal.Manager",




More information about the hal-commit mailing list