hal: Branch 'master' - 2 commits

[Martin Pitt]

 fdi/policy/10osvendor/10-x11-input.fdi |    7 +++++++
 hald/linux/device.c                    |    2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 337ca70b39ce9477a01b97e990ad731ca13ad664
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Fri Jun 26 09:38:04 2009 +0200

    add input.keys capability to input buttons
    
    Add input.keys capability to button input devices which support key events,
    such as the power, sleep, hibernate, and "lid" buttons. This causes them to be
    picked up by 10-x11-input.fdi and propagated to things like
    gnome-power-manager.
    
    Taken from
    http://cvs.fedoraproject.org/viewvc/devel/hal/hal-add-keys-to-buttons.patch?revision=1.1&view=markup
    
    http://bugzilla.gnome.org/show_bug.cgi?id=581363
    https://launchpad.net/bugs/384890

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 02c456f..653c9fe 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -1006,6 +1006,8 @@ input_test_key (HalDevice *d, const char *sysfs_path)
 		} else if (test_bit (KEY_SUSPEND, bitmask)) {
 			hal_device_property_set_string (d, "button.type", "hibernate");
 		}
+		if (input_test_keys (bitmask))
+			hal_device_add_capability (d, "input.keys");
 	} else {
 		gboolean is_keyboard = input_test_keyboard (bitmask);
 		gboolean is_keypad = input_test_keypad (bitmask);
commit 1cbaa7b9deac469d4a809f2b5f6ac1063d3370cc
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Fri Jun 26 09:23:03 2009 +0200

    10-x11-input.fdi: Add tablets
    
    Use X.org -evdev driver for tablets. Taken from Fedora package:
      http://cvs.fedoraproject.org/viewvc//devel/hal/hal-tablet-evdev.patch?view=markup
    
    Also used in Ubuntu package:
      http://bazaar.launchpad.net/%7Eubuntu-core-dev/hal/ubuntu/annotate/298/debian/patches/01_tablet_evdev.patch

diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi
index 769f75b..cff8fc5 100644
--- a/fdi/policy/10osvendor/10-x11-input.fdi
+++ b/fdi/policy/10osvendor/10-x11-input.fdi
@@ -16,6 +16,13 @@
       </match>
     </match>
 
+    <match key="info.capabilities" contains="input.tablet">
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+             string="Linux">
+        <merge key="input.x11_driver" type="string">evdev</merge>
+      </match>
+    </match>
+
     <match key="info.capabilities" contains="input.keys">
       <!-- If we're using Linux, we use evdev by default (falling back to
            keyboard otherwise). -->