From fc2dcc9c3092e8cc5f0b32716d5efe535d2c4f12 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 28 Jan 2015 11:28:38 +0100 Subject: Extend 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch. Let rgb file shipped with x2goagent supersede rgb file shipped with nxagent. FIXME: a better approach would be to decide at runtime if to use /etc/x2go/rgb or /etc/nxagent/rgb. --- ...gent_unbrand-nxagent-brand-x2goagent.full.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch') 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 + #include + +-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 -- cgit v1.2.3