aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch22
-rw-r--r--debian/patches/series1
-rw-r--r--debian/wrappers/x2goagent3
4 files changed, 26 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 52eed506f..1176b1206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ nx-libs (2:3.5.0.29-0x2go1) UNRELEASED; urgency=medium
* Update 320_nxagent_configurable-keystrokes.full.patch. Fix a typo that
prevented the /etc/nxagent/keystrokes.cfg file from being parsed. (Fixes:
#741).
+ * Add 321_nxagent_x2go-specific-keystroke-config.full.patch. If nxagent is
+ launched as x2goagent, use X2Go-specific paths for the keystrokes.cfg file.
+ (Fixes: #744).
[ Mihai Moldovan ]
* Change string "X2go" to "X2Go" where appropriate.
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);
diff --git a/debian/patches/series b/debian/patches/series
index 98d3e5e57..c65f64578 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -61,6 +61,7 @@
301_nx-X11_use-shared-libs.full.patch
302_nx-X11_xkbbasedir-detection.full.patch
320_nxagent_configurable-keystrokes.full.patch
+321_nxagent_x2go-specific-keystroke-config.full.patch
400_nxcomp-version.full+lite.patch
#401_nxcomp_bigrequests-and-genericevent-extensions.full+lite.patch
600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch
diff --git a/debian/wrappers/x2goagent b/debian/wrappers/x2goagent
index 129c7ca49..ba07a3f80 100644
--- a/debian/wrappers/x2goagent
+++ b/debian/wrappers/x2goagent
@@ -29,7 +29,4 @@ test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
export LD_LIBRARY_PATH
-NXAGENT_KEYSTROKEFILE=/etc/x2go/keystrokes.cfg
-export NXAGENT_KEYSTROKEFILE
-
exec $NX_LIBS/../x2go/bin/$NXAPP "$@"