diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2021-02-09 19:31:20 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-08 08:23:35 +0200 |
commit | 111ac2eed54438971554bd71115316472f1c9976 (patch) | |
tree | f7e0c910a042836181c98121d09508bb35c84693 /nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | |
parent | 8fe2c114084743e8726ae39089e3aa1491d22719 (diff) | |
download | nx-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/Keystroke.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index aff2e56ab..828649e5a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -314,11 +314,15 @@ void nxagentInitKeystrokes(Bool force) done = True; +#ifdef X2GO if (nxagentX2go) { homefile = "/.x2go/config/keystrokes.cfg"; etcfile = "/etc/x2go/keystrokes.cfg"; envvar = "X2GO_KEYSTROKEFILE"; - } else { + } + else +#endif + { homefile = "/.nx/config/keystrokes.cfg"; etcfile = "/etc/nxagent/keystrokes.cfg"; envvar = "NXAGENT_KEYSTROKEFILE"; |