diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-08-22 22:30:34 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2018-10-22 23:23:06 +0200 |
| commit | e1938c189223164f3a75cf848e90ecc1d2e55d15 (patch) | |
| tree | 01098708cb7f48349664b1d712c6a77af6bd008c /nx-X11/lib/modules/im/ximcp/imCallbk.c | |
| parent | 3dc4595560b34242fe4705af8c93d0024eeb2c56 (diff) | |
| download | nx-libs-e1938c189223164f3a75cf848e90ecc1d2e55d15.tar.gz nx-libs-e1938c189223164f3a75cf848e90ecc1d2e55d15.tar.bz2 nx-libs-e1938c189223164f3a75cf848e90ecc1d2e55d15.zip | |
libNX_X11: upgrade to X.org upstream version 1.6.6
We are at X.Org libX11 upstream commit 733f64b
Fixes: ArcticaProject/nx-libs #716, #719 and #720
Diffstat (limited to 'nx-X11/lib/modules/im/ximcp/imCallbk.c')
| -rw-r--r-- | nx-X11/lib/modules/im/ximcp/imCallbk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/modules/im/ximcp/imCallbk.c b/nx-X11/lib/modules/im/ximcp/imCallbk.c index 4e091d8ef..ead0806c6 100644 --- a/nx-X11/lib/modules/im/ximcp/imCallbk.c +++ b/nx-X11/lib/modules/im/ximcp/imCallbk.c @@ -624,16 +624,16 @@ _XimPreeditCaretCallback(Xim im, */ { CARD8 buf[sz_ximPacketHeader + sz_ximPreeditCaretReply]; - INT16 len = sz_XIMID + sz_XICID + sz_ximPreeditCaretReply; + INT16 rlen = sz_XIMID + sz_XICID + sz_ximPreeditCaretReply; int p; - _XimSetHeader((XPointer)buf, XIM_PREEDIT_CARET_REPLY, 0, &len); + _XimSetHeader((XPointer)buf, XIM_PREEDIT_CARET_REPLY, 0, &rlen); p = XIM_HEADER_SIZE; *(CARD16*)&buf[p] = (CARD16)im->private.proto.imid; p += sz_CARD16; *(CARD16*)&buf[p] = (CARD16)ic->private.proto.icid; p += sz_CARD16; *(CARD32*)&buf[p] = (CARD32)cbs.position; - if (!(_XimWriteData(im, len, buf))) { + if (!(_XimWriteData(im, rlen, buf))) { return XimCbError; } _XimFlushData(im); |