hal-info: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-misc.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d61ea8f51fd82f93b8808a955817b91dac023341
Author: Julian Sikorski <belegdol at gmail.com>
Date:   Tue Dec 16 08:52:23 2008 +0000

    correct satellite a100 keymapping
    
    it seems that the mapping in 30-keymap-misc.fdi for toshiba satellite
    a100 is incorrect. It maps the stop key (white rectangle) to stop,
    which gets translated by X to Cancel, while the proper mapping would be
    stopcd, which gets properly mapped to XF86AudioStop. Trivial patch
    attached.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index bed9c0b..82edd5f 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -136,7 +136,7 @@
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE A100">
-          <append key="input.keymap.data" type="strlist">e024:stop</append>
+          <append key="input.keymap.data" type="strlist">e024:stopcd</append>
           <append key="input.keymap.data" type="strlist">e032:www</append>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="Satellite A110">