From 076f9d3a6660fa7fef4ae9decaffd2feebdd32c4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 May 2012 12:20:37 +1000 Subject: [PATCH] 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 Reviewed-by: Chase Douglas --- dix/devices.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index c6fd3aa09..df464970f 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -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(); BUG_RETURN_VAL_MSG(other == NULL, FALSE, "[dix] cannot find pointer to pair with.\n"); - PairDevices(NULL, other, dev); + PairDevices(other, dev); } } else {