aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
index 4b18aa552..db5997685 100644
--- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
+++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch
@@ -294,3 +294,26 @@ Last-Update: 2012-01-11
extern Window nxagentSplashWindow;
+--- a/nx-X11/programs/Xserver/os/oscolor.c
++++ b/nx-X11/programs/Xserver/os/oscolor.c
+@@ -53,7 +53,19 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-static char* nxAltRgbPaths[] = {"/etc/nxagent/rgb", "/usr/share/nx/rgb", "/usr/local/share/nx/rgb", "/usr/NX/share/rgb", "/usr/share/X11/rgb", "/etc/X11/rgb"};
++/* FIXME: we need more intelligent code (like provided by the nxagentX2go
++ * var in hw/nxagent/Init.h) to detect our current runtime mode (running
++ * as x2goagent, running as nxagent)
++ */
++static char* nxAltRgbPaths[] = {"/etc/x2go/rgb", \
++ "/usr/share/x2go/rgb", \
++ "/usr/local/share/x2go/rgb", \
++ "/etc/nxagent/rgb", \
++ "/usr/share/nx/rgb", \
++ "/usr/local/share/nx/rgb", \
++ "/usr/NX/share/rgb", \
++ "/usr/share/X11/rgb", \
++ "/etc/X11/rgb"};
+ static char _NXRgbPath[1024];
+
+ #endif