diff options
| author | Horst Schirmeier <horst@schirmeier.com> | 2015-02-13 13:06:53 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-13 13:06:53 +0100 |
| commit | fea8fb5aeeeb77ecfd3e98791bd6f77a9782b588 (patch) | |
| tree | 8eb9d081c7a0eb637538307cba6d8b5ad8afea85 | |
| parent | e91277d02bf1288909daed3b0de8f876f6403acf (diff) | |
| download | nx-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).
| -rw-r--r-- | debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 6 |
3 files changed, 6 insertions, 26 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 deleted file mode 100644 index 795f10b76..000000000 --- a/debian/patches/321_nxagent_x2go-specific-keystroke-config.full.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Adapt paths of keystrokes.cfg if nxagent runs as x2goagent -Author: Horst Schirmeier <horst@schirmeier.com> - ---- 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 764a6fe1f..86575ece8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -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/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); |