diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2010-06-02 13:40:51 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-03 08:41:33 +1000 |
| commit | 968a79dcf5e17ac3963953ef56b8f94dbd75323b (patch) | |
| tree | 1b879eb366fb4efd5d5dd60dfdcb371e309c427e | |
| parent | 108b766c31b57fb1955d34d85673a235c7f743aa (diff) | |
Change keyboard controls on slave keyboards (#27926)
Makes the use of IsMaster in ProcChangeKeyboardControl consistent with other
similar loops.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c index b0b465326..250a4980d 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2021,7 +2021,7 @@ ProcChangeKeyboardControl (ClientPtr client) keyboard = PickKeyboard(client); for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { - if ((pDev == keyboard || (!IsMaster(keyboard) && pDev->u.master == keyboard)) && + if ((pDev == keyboard || (!IsMaster(pDev) && pDev->u.master == keyboard)) && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) { ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess); if (ret != Success) @@ -2030,7 +2030,7 @@ ProcChangeKeyboardControl (ClientPtr client) } for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { - if ((pDev == keyboard || (!IsMaster(keyboard) && pDev->u.master == keyboard)) && + if ((pDev == keyboard || (!IsMaster(pDev) && pDev->u.master == keyboard)) && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) { ret = DoChangeKeyboardControl(client, pDev, vlist, vmask); if (ret != Success) |