summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2008-07-24 17:41:48 +0930
committerPeter Hutterer <peter.hutterer@who-t.net>2008-07-28 09:05:53 +0930
commit54651ff5ec54f4c621e060b19f31d77d519ef158 (patch)
tree6dd27999208134d3e098bc0b7e9a65b9b45a94e7
parent70bd8261223366dae9dfdbb999691328d85f093c (diff)
xkb: remove superfluous inputInfo.keyboard treatment.
Really not necessary, we can just walk the list and spare us the special treatment of the VCK.
-rw-r--r--xkb/xkbUtils.c28
1 files changed, 11 insertions, 17 deletions
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;
}
}