hal: Branch 'master'

[Danny Kukawka]

 hald/linux/addons/addon-acpi.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
diff-tree 5dea29db08b7d8130f19c511250b849b8dca8c46 (from fcb9ac034c674cbe10cfe89aad5637fee8e55a5d)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 11 18:31:47 2007 +0200

    forward ThinkPad ACPI event for killswitch
    
    Forward the ThinkPad ACPI event '7000' from the killswitch as
    ButtonPressed=killswitch from the hal-addon-acpi to allow e.g.
    NM to monitor if the killswitch was used.

diff --git a/hald/linux/addons/addon-acpi.c b/hald/linux/addons/addon-acpi.c
index 08b92be..9a8b85a 100644
--- a/hald/linux/addons/addon-acpi.c
+++ b/hald/linux/addons/addon-acpi.c
@@ -154,6 +154,9 @@ handle_ibm_acpi_events (LibHalContext *c
 			case 20490: /* Tablet rotated back*/
 				button = "tabletpc_rotate_normal";
 				break;
+			case 28672: /* killswitch */
+				button = "killswitch";
+				break;
 			default:
 				break;