xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 780eff230ce41ad785e54d61a82c731269ae0446
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Nov 28 11:18:14 2008 -0800

    XQuartz: Avoid some warning messages being spewed to system.log by AppKit

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index eb0b8ba..dc5a55f 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -963,7 +963,9 @@ extern int darwin_modifier_flags; // darwinEvents.c
         handle_mouse:
             pDev = darwinPointer;
 
-            if([e subtype] == NSTabletProximityEventSubtype) {
+            /* NSTabletPoint can have no subtype */
+            if([e type] != NSTabletPoint &&
+               [e subtype] == NSTabletProximityEventSubtype) {
                 switch([e pointingDeviceType]) {
                     case NSEraserPointingDevice:
                         darwinTabletCurrent=darwinTabletEraser;