From e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sat, 30 Aug 2014 13:41:12 +0200
Subject: xserver libxtrans libxcb xcb-proto libX11 mesa git update 30 Aug 2014

xserver          commit 3a51418b2db353519a1779cf3cebbcc9afba2520
libxcb           commit b0e6c2de09c7474868dd7185674fa113a5c2e0aa
libxcb/xcb-proto commit dc0c544fe044ddeb4917bba0c2fed66c70e6db43
libX11           commit 6101b967b641355dd863fd1ce52c6a7d58bcbe68
libxtrans        commit 17491de45c352c833442cccf17a9bd65909889db
mesa             commit 932b0ef1ceecf873213447a8778e5cbe1b3b6be7
---
 xorg-server/dix/devices.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xorg-server/dix')

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 5d26fae21..f17a3ac65 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -416,7 +416,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
         XISendDeviceHierarchyEvent(flags);
     }
 
-    if (!IsMaster(dev))
+    if (!IsMaster(dev) && !IsFloating(dev))
         XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, 0);
     RecalculateMasterButtons(dev);
 
-- 
cgit v1.2.3