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

Signed-off-by: Pierre Ossman <pierre@ossman.eu>
---
 Xi/exevents.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 641bead..54096f7 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -977,7 +977,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
 
-- 
1.6.2.2