aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-04 15:41:28 +0000
committermarha <marha@users.sourceforge.net>2010-11-04 15:41:28 +0000
commit41c64098a90b4e974d5005a1619472f2e8a64ea1 (patch)
treedf231908c0c9c03bc3af2bb1f47b8667b7dd567c /xorg-server/Xi
parent135e2e73bbe7155901a651c38b772e7b4547f39c (diff)
downloadvcxsrv-41c64098a90b4e974d5005a1619472f2e8a64ea1.tar.gz
vcxsrv-41c64098a90b4e974d5005a1619472f2e8a64ea1.tar.bz2
vcxsrv-41c64098a90b4e974d5005a1619472f2e8a64ea1.zip
xserver git update 4/11/2010
Diffstat (limited to 'xorg-server/Xi')
-rw-r--r--xorg-server/Xi/listdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/Xi/listdev.c b/xorg-server/Xi/listdev.c
index 52fc85f57..d84dcd8d9 100644
--- a/xorg-server/Xi/listdev.c
+++ b/xorg-server/Xi/listdev.c
@@ -180,10 +180,10 @@ CopySwapDevice(ClientPtr client, DeviceIntPtr d, int num_classes,
dev->use = IsXKeyboard;
else if (IsMaster(d) && IsPointerDevice(d))
dev->use = IsXPointer;
- else if (d->key && d->kbdfeed)
- dev->use = IsXExtensionKeyboard;
else if (d->valuator && d->button)
dev->use = IsXExtensionPointer;
+ else if (d->key && d->kbdfeed)
+ dev->use = IsXExtensionKeyboard;
else
dev->use = IsXExtensionDevice;