diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-02-15 11:45:14 +0100 |
| commit | 24d7d0faa4b5c12c691599bf61bae5cfe1ef4120 (patch) | |
| tree | afec05c1ea5a1f9fcdc1a54f4d2b5050706e75c2 /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
| parent | b61934be2e9b4a8d3112270b0e691d47f99ba39f (diff) | |
| parent | 586742b715a3e3451a4587439778c410a1970cdd (diff) | |
| download | nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.gz nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.tar.bz2 nx-libs-24d7d0faa4b5c12c691599bf61bae5cfe1ef4120.zip | |
Merge branch 'uli42-pr/revert' into 3.6.x
Attributes GH PR #773: https://github.com/ArcticaProject/nx-libs/pull/773
Fixes ArcticaProject/nx-libs#772.
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 4f1349ced..af27c6e28 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 && nxagentKeyboard && (strcmp(nxagentKeyboard, "null/null") == 0)) + if (nxagentX2go == 1 && 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) + if (nxagentX2go == 1) nxagentWriteKeyboardDir(); } else @@ -891,7 +891,7 @@ XkbError: * know about that yet. Once x2go starts using clone * we can drop this here. */ - if (nxagentX2go) + if (nxagentX2go == 1) nxagentWriteKeyboardFile(nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions); } } @@ -935,7 +935,7 @@ XkbError: XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls); } - if (nxagentOption(Shadow) && pDev && pDev->key) + if (nxagentOption(Shadow) == 1 && pDev && pDev->key) { NXShadowInitKeymap(&(pDev->key->curKeySyms)); } |