diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-13 12:32:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-13 12:32:06 +0100 |
| commit | b61934be2e9b4a8d3112270b0e691d47f99ba39f (patch) | |
| tree | d0cb58feeddb553a6e9ab6daea5056bd0221eb2b /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
| parent | 427ac344c53acf4cb361f24e1df771137f83ea6b (diff) | |
| parent | 16cd2bbe1c4425e3fa557f9ca0723aa94a50b071 (diff) | |
| download | nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.tar.gz nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.tar.bz2 nx-libs-b61934be2e9b4a8d3112270b0e691d47f99ba39f.zip | |
Merge branch 'uli42-pr/misc' into 3.6.x
Attributes GH PR #766: https://github.com/ArcticaProject/nx-libs/pull/766
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index af27c6e28..4f1349ced 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -753,7 +753,7 @@ XkbError: fprintf(stderr, "nxagentKeyboardProc: nxagentKeyboard is [%s].\n", nxagentKeyboard ? nxagentKeyboard : "NULL"); #endif - if (nxagentX2go == 1 && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) + if (nxagentX2go && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) { #ifdef TEST fprintf(stderr, "%s: changing nxagentKeyboard from [null/null] to [clone].\n", __func__); @@ -873,7 +873,7 @@ XkbError: * instead of a file. Which is achieved by passing NULL to * nxagentWriteKeyboardFile. */ - if (nxagentX2go == 1) + if (nxagentX2go) nxagentWriteKeyboardDir(); } else @@ -891,7 +891,7 @@ XkbError: * know about that yet. Once x2go starts using clone * we can drop this here. */ - if (nxagentX2go == 1) + if (nxagentX2go) nxagentWriteKeyboardFile(nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions); } } @@ -935,7 +935,7 @@ XkbError: XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls); } - if (nxagentOption(Shadow) == 1 && pDev && pDev->key) + if (nxagentOption(Shadow) && pDev && pDev->key) { NXShadowInitKeymap(&(pDev->key->curKeySyms)); } |