diff options
| -rw-r--r-- | xkb/xkbUtils.c | 28 |
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; } } |