hal/hald/linux2/addons addon-keyboard.c,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2/addons
In directory gabe:/tmp/cvs-serv6499/hald/linux2/addons

Modified Files:
	addon-keyboard.c 
Log Message:
2006-02-09  David Zeuthen  <davidz at redhat.com>

        * hald-runner/runner.c (run_request_run): Print out some useful
        debug information

        * hald/linux2/addons/addon-keyboard.c (main): Don't set button.type
        or button.has_state as these are merged from the fdi file.

        * hald/run-hald.sh: Use absolute paths in HALD_RUNNER_PATH and PATH
        cuz otherwise helpers won't get invoked...

        * fdi/policy/10osvendor/Makefile.am: Add 10-keyboard-policy.fdi

        * fdi/policy/10osvendor/10-keyboard-policy.fdi: Forgot to add file.
        Also from Matthew Garrett <mjg59 at srcf.ucam.org>. Tweak file to
        merge button.type and button.has_state instead of setting



Index: addon-keyboard.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-keyboard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- addon-keyboard.c	8 Feb 2006 13:54:44 -0000	1.1
+++ addon-keyboard.c	9 Feb 2006 16:32:24 -0000	1.2
@@ -169,11 +169,11 @@
 	char *device_file;
 	FILE *eventfp;
 
-	dbus_error_init (&error);
-
 	if (getenv ("HALD_VERBOSE") != NULL)
 		is_verbose = TRUE;
 
+	dbus_error_init (&error);
+
 	if ((udi = getenv ("UDI")) == NULL)
 		goto out;
 	
@@ -188,10 +188,6 @@
 	if (!eventfp)
 		goto out;
 
-	libhal_device_add_capability (ctx, udi, "button", &error);
-	libhal_device_set_property_string (ctx, udi, "button.type", "", &error);
-	libhal_device_set_property_bool (ctx, udi, "button.has_state", FALSE, &error);
-
 	drop_privileges();
 
 	while (1)