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

xkb: remove superfluous checks in if statement.

This commit is contained in:
Peter Hutterer 2008-05-20 18:57:31 +09:30
parent 7a550cefd9
commit 4056595fc7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkb/xkbUtils.c
View File

@ -2052,7 +2052,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
* just MapNotify. we also need to send NKN if the geometry * just MapNotify. we also need to send NKN if the geometry
* changed (obviously ...). */ * changed (obviously ...). */
if ((src->min_key_code != dst->min_key_code || if ((src->min_key_code != dst->min_key_code ||
src->max_key_code != dst->max_key_code) && sendNotifies) { src->max_key_code != dst->max_key_code)) {
nkn.oldMinKeyCode = dst->min_key_code; nkn.oldMinKeyCode = dst->min_key_code;
nkn.oldMaxKeyCode = dst->max_key_code; nkn.oldMaxKeyCode = dst->max_key_code;
nkn.deviceID = nkn.oldDeviceID = pDev->id; nkn.deviceID = nkn.oldDeviceID = pDev->id;
@ -2062,8 +2062,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
nkn.requestMinor = X_kbSetMap; /* XXX bare-faced lie */ nkn.requestMinor = X_kbSetMap; /* XXX bare-faced lie */
nkn.changed = XkbAllNewKeyboardEventsMask; nkn.changed = XkbAllNewKeyboardEventsMask;
XkbSendNewKeyboardNotify(pDev, &nkn); XkbSendNewKeyboardNotify(pDev, &nkn);
} } else
else if (sendNotifies) { {
mn.deviceID = pDev->id; mn.deviceID = pDev->id;
mn.minKeyCode = src->min_key_code; mn.minKeyCode = src->min_key_code;
mn.maxKeyCode = src->max_key_code; mn.maxKeyCode = src->max_key_code;