hal/hald hald_test_libhal.c,1.4,1.5

David Zeuthen david at freedesktop.org
Wed Feb 16 13:25:37 PST 2005


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

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

	Fix up more sloppy errors incuded from patches that I should
	have reviewed more carefully :-/

	* libhal-storage/libhal-storage.c: Match against
	LIBHAL_PROPERTY_TYPE_*, not DBUS_TYPE_*
	(libhal_drive_policy_default_use_managed_keyword):
	(libhal_drive_policy_default_get_mount_root):
	(libhal_drive_policy_default_use_managed_keyword):
	(libhal_drive_policy_default_get_managed_keyword_primary):
	(libhal_drive_policy_default_get_managed_keyword_secondary):
	(libhal_drive_policy_get_mount_options):
	(libhal_volume_policy_get_mount_options): Yikes, Yikes, rename
	"/org/freedesktop/LibHal" back to "/org/freedesktop/Hal"

	* libhal/libhal.c (libhal_property_fill_value_from_variant): p->type
	wasn't being assigned :-/. Also, DBUS_TYPE_BOOLEAN wasn't handled.

	* hald/hald_test_libhal.c (check_libhal): Fix this test



Index: hald_test_libhal.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_test_libhal.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hald_test_libhal.c	16 Feb 2005 18:39:56 -0000	1.4
+++ hald_test_libhal.c	16 Feb 2005 21:25:35 -0000	1.5
@@ -308,7 +308,7 @@
 
 				case LIBHAL_PROPERTY_TYPE_BOOLEAN:
 					if (strcmp (key, "test.bool") == 0) {
-						if (libhal_psi_get_bool (&it))
+						if (libhal_psi_get_bool (&it) == TRUE)
 							psi_num_passed++;
 						else
 							printf ("fail on %s\n", key);




More information about the hal-commit mailing list