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 <peter.hutte...@who-t.net>
---
dix/devices.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/dix/devices.c b/dix/devices.c
index 677b76c..0755cd7 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 {
--
1.7.10.1
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
