[Pommed-commits] r539 - in trunk: . pommed

[jblache at alioth.debian.org]

Author: jblache
Date: 2009-01-02 20:19:41 +0000 (Fri, 02 Jan 2009)
New Revision: 539

Modified:
   trunk/ChangeLog
   trunk/pommed/evdev.c
Log:
Do not reject the Apple Bluetooth keyboard because of EV_ABS events.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-29 12:22:15 UTC (rev 538)
+++ trunk/ChangeLog	2009-01-02 20:19:41 UTC (rev 539)
@@ -4,6 +4,8 @@
 version 1.25:
 	- pommed: check current hardware backlight level before setting AC
 	or battery level. Do not act if the backlight is off.
+	- pommed: do not reject the Apple Bluetooth keyboard because of
+	advertised EV_ABS events.
 
 version 1.24:
 	- pommed: add new path for fnmode setting for 2.6.28.

Modified: trunk/pommed/evdev.c
===================================================================
--- trunk/pommed/evdev.c	2008-12-29 12:22:15 UTC (rev 538)
+++ trunk/pommed/evdev.c	2009-01-02 20:19:41 UTC (rev 539)
@@ -3,7 +3,7 @@
  *
  * $Id$
  *
- * Copyright (C) 2006-2008 Julien BLACHE <jb at jblache.org>
+ * Copyright (C) 2006-2009 Julien BLACHE <jb at jblache.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -814,7 +814,8 @@
 	  return -1;
 	}
     }
-  else if (test_bit(EV_ABS, bit[0]))
+  /* Wireless keyboards advertise EV_ABS events, single them out */
+  else if (test_bit(EV_ABS, bit[0]) && !(evdev_is_extkbd(id)))
     {
       logdebug("Discarding evdev with EV_ABS event type (mouse/trackpad)\n");