From b72c6b083baeadfd7b18b6025df054be502d6e28 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 6 Jan 2009 09:01:48 +1000
Subject: dix: remove inputInfo.keyboard reference in QueryPointer handling.

PickKeyboard() is to be used instead.
---
 dix/events.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index 37c922053..52a6ef461 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5130,6 +5130,7 @@ ProcQueryPointer(ClientPtr client)
     xQueryPointerReply rep;
     WindowPtr pWin, t;
     DeviceIntPtr mouse = PickPointer(client);
+    DeviceIntPtr kbd = PickKeyboard(client);
     SpritePtr pSprite;
     int rc;
     REQUEST(xResourceReq);
@@ -5147,7 +5148,7 @@ ProcQueryPointer(ClientPtr client)
 	MaybeStopHint(mouse, client);
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.mask = mouse->button->state | inputInfo.keyboard->key->state;
+    rep.mask = mouse->button->state | kbd->key->state;
     rep.length = 0;
     rep.root = (RootWindow(mouse))->drawable.id;
     rep.rootX = pSprite->hot.x;
-- 
cgit v1.2.3