diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-09 08:14:39 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-09 20:50:32 +1000 |
| commit | 011cee3103c146c8096b7098a27993f99e07a824 (patch) | |
| tree | 65f13349a21d344fd8aeb0faf91d80b3f29763d0 /dix/devices.c | |
| parent | 630a6e9d14ffbf036fa72f580c72c0172d7c20bd (diff) | |
dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix/devices.c')
| -rw-r--r-- | dix/devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dix/devices.c b/dix/devices.c index 4a36669ac..b9d1c85a5 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1925,14 +1925,14 @@ ProcBell(ClientPtr client) else newpercent = base - newpercent + stuff->percent; - for (keybd = inputInfo.devices; keybd; keybd = keybd->next) { + for (dev = inputInfo.devices; dev; dev = dev->next) { if ((dev == keybd || (!dev->isMaster && dev->u.master == keybd)) && - keybd->kbdfeed && keybd->kbdfeed->BellProc) { + dev->kbdfeed && dev->kbdfeed->BellProc) { rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess); if (rc != Success) return rc; - XkbHandleBell(FALSE, FALSE, keybd, newpercent, + XkbHandleBell(FALSE, FALSE, dev, newpercent, &dev->kbdfeed->ctrl, 0, None, NULL, client); } } |