frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: remove superfluous inputInfo.keyboard treatment. 

Really not necessary, we can just walk the list and spare us the special
treatment of the VCK.
This commit is contained in:
Peter Hutterer 2008-07-24 17:41:48 +09:30
parent 70bd826122
commit 54651ff5ec
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkb/xkbUtils.c
View File

@ -2014,11 +2014,6 @@ 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; for (tmpDev = inputInfo.devices; tmpDev && !pDev;
tmpDev = tmpDev->next) { tmpDev = tmpDev->next) {
if (tmpDev->key && tmpDev->key->xkbInfo && if (tmpDev->key && tmpDev->key->xkbInfo &&
@ -2035,7 +2030,6 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
break; break;
} }
} }
}
if (sendNotifies) { if (sendNotifies) {
if (!pDev) { if (!pDev) {