From 3b1ff33587458bad45777b8eb74b81c3e55987ad Mon Sep 17 00:00:00 2001
From: Pierre Ossman <pierre@ossman.eu>
Date: Tue, 28 Apr 2009 12:29:07 +0200
Subject: Xi: don't send XKB mapping notifications when XKB is disabled

Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 Xi/exevents.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Xi/exevents.c')

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 482041fd7..398a26b20 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1778,7 +1778,8 @@ SendDeviceMappingNotify(ClientPtr client, CARD8 request,
     }
 
 #ifdef XKB
-    if (request == MappingKeyboard || request == MappingModifier)
+    if (!noXkbExtension && (request == MappingKeyboard ||
+                            request == MappingModifier))
         XkbApplyMappingChange(dev, request, firstKeyCode, count, client);
 #endif
 
-- 
cgit v1.2.3