Attachment 36007 Details for Bug 27926 – Proposed fix (git format)

[patch] Proposed fix (git format)

0001-Change-keyboard-controls-on-slave-keyboards-27926.patch (text/plain), 1.60 KB, created by Nicolas George on 2010-06-02 04:58:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas George

Created: 2010-06-02 04:58:00 UTC

Size: 1.60 KB

patch

obsolete

>From a88e982f168eee2630943cac6425f6de6b7ac6ab Mon Sep 17 00:00:00 2001
>From: Nicolas George <nicolas.george@normalesup.org>
>Date: Wed, 2 Jun 2010 13:40:51 +0200
>Subject: [PATCH] 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>
>---
> dix/devices.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/dix/devices.c b/dix/devices.c
>index cf23bc6..3e401c4 100644
>--- a/dix/devices.c
>+++ b/dix/devices.c
>@@ -1950,7 +1950,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)
>@@ -1959,7 +1959,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)
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 27926: 35362 | 36007

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.