Commit 076f9d3a authored by Peter Hutterer's avatar Peter Hutterer
Browse files

dix: drop client argument from PairDevices - unused

This is a leftover from early MPX days where any keyboard could be paired
with any pointer (before the device hierarchy).
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <>
Reviewed-by: default avatarChase Douglas <>
parent d034605f
......@@ -178,12 +178,9 @@ DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
/* Pair the keyboard to the pointer device. Keyboard events will follow the
* pointer sprite. Only applicable for master devices.
* If the client is set, the request to pair comes from some client. In this
* case, we need to check for access. If the client is NULL, it's from an
* internal automatic pairing, we must always permit this.
static int
PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
PairDevices(DeviceIntPtr ptr, DeviceIntPtr kbd)
if (!ptr)
return BadDevice;
......@@ -369,7 +366,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
other = NextFreePointerDevice();
"[dix] cannot find pointer to pair with.\n");
PairDevices(NULL, other, dev);
PairDevices(other, dev);
else {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment