From fea8fb5aeeeb77ecfd3e98791bd6f77a9782b588 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Fri, 13 Feb 2015 13:06:53 +0100 Subject: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent (321_nxagent_x2go-specific-keystroke-config.full.patch). --- nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keystroke.c') 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 @@ -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); -- cgit v1.2.3