hal/hald/linux2/probing probe-input.c,1.12,1.13

[David Zeuthen]

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

Modified Files:
	probe-input.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: probe-input.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/probing/probe-input.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- probe-input.c	8 Feb 2006 01:34:12 -0000	1.12
+++ probe-input.c	9 Feb 2006 16:32:24 -0000	1.13
@@ -145,6 +145,9 @@
 	char name[128];
 	struct input_id id;
 
+	if ((getenv ("HALD_VERBOSE")) != NULL)
+		is_verbose = TRUE;
+
 	fd = -1;
 
 	/* assume failure */
@@ -162,9 +165,6 @@
 	if (device_file == NULL)
 		goto out;
 
-	if ((getenv ("HALD_VERBOSE")) != NULL)
-		is_verbose = TRUE;
-
 	dbg ("Doing probe-input for %s (udi=%s)",
 	     device_file, udi);