aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-02-09 19:31:20 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:23:35 +0200
commit111ac2eed54438971554bd71115316472f1c9976 (patch)
treef7e0c910a042836181c98121d09508bb35c84693 /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
parent8fe2c114084743e8726ae39089e3aa1491d22719 (diff)
downloadnx-libs-111ac2eed54438971554bd71115316472f1c9976.tar.gz
nx-libs-111ac2eed54438971554bd71115316472f1c9976.tar.bz2
nx-libs-111ac2eed54438971554bd71115316472f1c9976.zip
nxagent: make X2GO support optional
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 731844874..2142adc8e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -663,7 +663,8 @@ XkbError:
#endif
nxagentChangeOption(KeycodeConversion, KeycodeConversionOff);
- /*
+#ifdef X2GO
+ /*
* when cloning we do not want X2Go to set the keyboard
* via a keyboard file generated by nxagent. The defined
* method for switching that off is the creation of a dir
@@ -692,6 +693,7 @@ XkbError:
{
nxagentWriteKeyboardFile(nxagentRemoteRules, nxagentRemoteModel, nxagentRemoteLayout, nxagentRemoteVariant, nxagentRemoteOptions);
}
+#endif
}
nxagentKeycodeConversionSetup();
}