hal: Branch 'master'

[Holger Macht]

 hald/linux/addons/addon-cpufreq.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

New commits:
diff-tree 8d0247f630b28633914f91b800d72863a71cab82 (from e6d942a65d9e0fdebf6367b1f874742066bce73b)
Author: Holger Macht <holger at homac.de>
Date:   Fri Jan 12 12:43:59 2007 +0100

    additional error check

diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c
index 55ec828..1fd6aa4 100644
--- a/hald/linux/addons/addon-cpufreq.c
+++ b/hald/linux/addons/addon-cpufreq.c
@@ -1163,8 +1163,13 @@ gboolean dbus_init(void)
 	libhal_device_add_capability(halctx,
 				     "/org/freedesktop/Hal/devices/computer",
 				     "cpufreq_control",
-				     NULL);
+				     &dbus_error);
 
+	if (dbus_error_is_set(&dbus_error)) {
+		HAL_WARNING(("Cannot add capability cpufreq_control: %s", dbus_error.message));
+		goto Error;
+	}
+	
 	dbus_connection_setup_with_g_main(dbus_connection, NULL);
 	dbus_connection_add_filter(dbus_connection, dbus_filter_function, NULL, NULL);
 	dbus_connection_set_exit_on_disconnect(dbus_connection, 0);