diff options
| author | Yann Droneaud <yann@droneaud.fr> | 2011-10-11 17:27:59 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:25 +0200 |
| commit | cded3305d3c10f1b3918ea07120fb527f85b7802 (patch) | |
| tree | 524a27298bc2a3860e2c9d4dfe7dfe4fbb0da5a9 /nx-X11 | |
| parent | 8d1e059403555e7feafdaff788c9e716fcb68ce3 (diff) | |
| download | nx-libs-cded3305d3c10f1b3918ea07120fb527f85b7802.tar.gz nx-libs-cded3305d3c10f1b3918ea07120fb527f85b7802.tar.bz2 nx-libs-cded3305d3c10f1b3918ea07120fb527f85b7802.zip | |
Return name instead of False in XSetICValues()
In case of error, XSetICValues() must return the first argument
that failed to be set.
But in some error paths, it returns False, which is converted to NULL,
so the function returns OK in case of error.
Signed-off-by: Yann Droneaud <yann@droneaud.fr>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/lib/X11/imRm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/lib/X11/imRm.c b/nx-X11/lib/X11/imRm.c index 3c28b1e29..6761bd351 100644 --- a/nx-X11/lib/X11/imRm.c +++ b/nx-X11/lib/X11/imRm.c @@ -2881,13 +2881,13 @@ _XimSetICValueData( if(mode & XIM_PREEDIT_ATTR) { if (!_XimEncodeLocalPreeditValue(ic, res, (XPointer)p)) - return False; + return p->name; } else if(mode & XIM_STATUS_ATTR) { if (!_XimEncodeLocalStatusValue(ic, res, (XPointer)p)) - return False; + return p->name; } else { if (!_XimEncodeLocalTopValue(ic, res, (XPointer)p, flag)) - return False; + return p->name; } if(_XimEncodeLocalICAttr(ic, res, top, p, mode) == False) { return p->name; |