diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2010-06-02 13:40:51 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-11-11 13:14:58 +0100 |
| commit | a3e6e599f50902712f4a10fdbf806371335aaed3 (patch) | |
| tree | 8fcfbe8b72e76aad313f953a99213d5695a70f46 | |
| parent | 48407d86e3be526826c2207886ec304779c93f78 (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>
(cherry picked from commit 968a79dcf5e17ac3963953ef56b8f94dbd75323b)
| -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 87b6dc7b5..1037e4254 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1956,7 +1956,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) @@ -1965,7 +1965,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) |