xserver: Branch 'xorg-server-1.5-apple' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/quartzKeyboard.c  |    2 --
 hw/xquartz/xpr/appledristr.h |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1c88a68bedebaff96a2736bb5513d0cfc52e33b0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jan 10 03:07:37 2009 -0800

    XQuartz: Get rid of SwitchCoreKeyboard where it's not needed...

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 1f552e0..f0f205b 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -363,8 +363,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
         XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
     }
 
-    SwitchCoreKeyboard(pDev);   
-
     DarwinKeyboardSetDeviceKeyMap(&keySyms);
 }
 
commit 366b08598cc3abbdea4462f6523116aede7c114a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jan 7 18:27:21 2009 -0800

    XQuartz: Update padding in appledristr.  This shouldn't change how the struct ends up in memory, but should make it more obvious for human eyes
    (cherry picked from commit f7b6c1907c326a1befd8b5c8a1d311d551e8670f)

diff --git a/hw/xquartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h
index 8649fd3..c6ad17b 100644
--- a/hw/xquartz/xpr/appledristr.h
+++ b/hw/xquartz/xpr/appledristr.h
@@ -154,7 +154,7 @@ typedef struct _AppleDRINotify {
 	BYTE	kind;
 	CARD16	sequenceNumber B16;
 	Time	time B32;	/* time of change */
-	CARD16	pad1 B16;
+	CARD32	pad1 B32;
 	CARD32	arg B32;
 	CARD32	pad3 B32;
 } xAppleDRINotifyEvent;