From 54651ff5ec54f4c621e060b19f31d77d519ef158 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 24 Jul 2008 17:41:48 +0930 Subject: xkb: remove superfluous inputInfo.keyboard treatment. Really not necessary, we can just walk the list and spare us the special treatment of the VCK. --- xkb/xkbUtils.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'xkb/xkbUtils.c') diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 0ed7e689a..8409eced7 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -2014,26 +2014,20 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies) } } - if (inputInfo.keyboard->key->xkbInfo && - inputInfo.keyboard->key->xkbInfo->desc == dst) { - pDev = inputInfo.keyboard; - } - else { - for (tmpDev = inputInfo.devices; tmpDev && !pDev; - tmpDev = tmpDev->next) { - if (tmpDev->key && tmpDev->key->xkbInfo && + for (tmpDev = inputInfo.devices; tmpDev && !pDev; + tmpDev = tmpDev->next) { + if (tmpDev->key && tmpDev->key->xkbInfo && tmpDev->key->xkbInfo->desc == dst) { - pDev = tmpDev; - break; - } + pDev = tmpDev; + break; } - for (tmpDev = inputInfo.off_devices; tmpDev && !pDev; - tmpDev = tmpDev->next) { - if (tmpDev->key && tmpDev->key->xkbInfo && + } + for (tmpDev = inputInfo.off_devices; tmpDev && !pDev; + tmpDev = tmpDev->next) { + if (tmpDev->key && tmpDev->key->xkbInfo && tmpDev->key->xkbInfo->desc == dst) { - pDev = tmpDev; - break; - } + pDev = tmpDev; + break; } } -- cgit v1.2.3