aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorHorst Schirmeier <horst@schirmeier.com>2015-02-13 13:06:53 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 13:06:53 +0100
commitfea8fb5aeeeb77ecfd3e98791bd6f77a9782b588 (patch)
tree8eb9d081c7a0eb637538307cba6d8b5ad8afea85 /nx-X11
parente91277d02bf1288909daed3b0de8f876f6403acf (diff)
downloadnx-libs-fea8fb5aeeeb77ecfd3e98791bd6f77a9782b588.tar.gz
nx-libs-fea8fb5aeeeb77ecfd3e98791bd6f77a9782b588.tar.bz2
nx-libs-fea8fb5aeeeb77ecfd3e98791bd6f77a9782b588.zip
Adapt paths of keystrokes.cfg if nxagent runs as x2goagent (321_nxagent_x2go-specific-keystroke-config.full.patch).
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index d61c65b1a..404ed035d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -27,6 +27,7 @@
#include "Options.h"
#include "Keystroke.h"
#include "Drawable.h"
+#include "Init.h" /* extern int nxagentX2go */
#include <unistd.h>
@@ -261,6 +262,11 @@ static void parse_keystroke_file(void)
char *homefile = "/.nx/config/keystrokes.cfg";
char *etcfile = "/etc/nxagent/keystrokes.cfg";
+ if (nxagentX2go) {
+ homefile = "/.x2go/config/keystrokes.cfg";
+ etcfile = "/etc/x2go/keystrokes.cfg";
+ }
+
if (nxagentKeystrokeFile != NULL && access(nxagentKeystrokeFile, R_OK) == 0)
{
filename = strdup(nxagentKeystrokeFile);