hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 4276780fd59f649e9ad254e16c49777598cdfe58
Author: Paul Bolle <pebolle at tiscali.nl>
Date:   Tue Jun 17 20:03:44 2008 +0200

    add zoom and ThinkPad events to acpi addon for IBM/Lenovo
    
    Add "zoom" ("Fn+Space") and "ThinkPad" (a.k.a. "Access IBM" and
    "ThinkVantage") button events to the acpi addon for IBM/LENOVO ThinkPads.
    As of kernel 2.6.25 there are acpi events generated for these buttons too.
    
    Fixed a trivial typo too ("Fn=Insert").
    
    (Note: fix/close bug fd.o #16335)

diff --git a/hald/linux/addons/addon-acpi.c b/hald/linux/addons/addon-acpi.c
index ea4ad30..fb4847d 100644
--- a/hald/linux/addons/addon-acpi.c
+++ b/hald/linux/addons/addon-acpi.c
@@ -143,11 +143,17 @@ handle_ibm_acpi_events (LibHalContext *ctx, int type, int event)
 				button = "Fn+Backspace";
 				break;
 			case 4110: /* Fn+Insert*/ 
-				button = "Fn=Insert";
+				button = "Fn+Insert";
 				break;
 			case 4111: /* Fn+Delete*/ 
 				button = "Fn+Delete";
 				break;
+			case 4116: /* Fn+Space */
+				button = "zoom";
+				break;
+			case 4120: /* ThinkPad */
+				button = "ThinkPad";
+				break;
 			case 20489: /* Tablet rotated */
 				button = "tabletpc_rotate_180";
 				break;