hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-keyboard-policy.fdi |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree e0d3327b68fc043e6ac8a1b0bdf97249476a3968 (from 5f7fc3562838aa8c44cfa3f0227cdac077c0f64f)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 1 04:48:35 2007 -0400

    give back the "button" capability to keyboards
    
    Without this, gnome-power-manager will not react to buttons on some
    keyboards.

diff --git a/fdi/policy/10osvendor/10-keyboard-policy.fdi b/fdi/policy/10osvendor/10-keyboard-policy.fdi
index 9cdf34e..9599384 100644
--- a/fdi/policy/10osvendor/10-keyboard-policy.fdi
+++ b/fdi/policy/10osvendor/10-keyboard-policy.fdi
@@ -9,6 +9,9 @@
       </match>
       <match key="info.capabilities" contains="input.keyboard">
 	<append key="info.addons" type="strlist">hald-addon-keyboard</append>
+        <match key="info.capabilities" contains_not="button">
+	  <append key="info.capabilities" type="strlist">button</append>
+        </match>
       </match>
     </match>
   </device>