aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch')
-rw-r--r--debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
new file mode 100644
index 000000000..8ab4f939f
--- /dev/null
+++ b/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch
@@ -0,0 +1,22 @@
+--- 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);