From f01ee198ff0cbd7ca418217a84248d1c6131a0c6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 13 Mar 2009 15:22:23 +1000
Subject: [PATCH] dix: don't use inputInfo.keyboard to get the focus window in
 ActivateKbdGrab

I'm not sure if that's the right solution, but the other one is wronger.
---
 dix/events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index 14f5a9916..8b30706de 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1517,7 +1517,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
     else
 	oldWin = keybd->spriteInfo->sprite->win;
     if (oldWin == FollowKeyboardWin)
-	oldWin = inputInfo.keyboard->focus->win;
+	oldWin = keybd->focus->win;
     if (keybd->valuator)
 	keybd->valuator->motionHintWindow = NullWindow;
     DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);