diff options
| author | Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> | 2015-02-13 13:57:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-13 13:57:39 +0100 |
| commit | 1fd8551f1632efbc2655c9293087bba08cf2f0c9 (patch) | |
| tree | b94599ab851a7cb9078d0a21e5170ff12d3b44ff /nx-X11/programs/Xserver/os/oscolor.c | |
| parent | 23fb617551f7d89dbc1fc9e216b7f12d2936e1a2 (diff) | |
| download | nx-libs-1fd8551f1632efbc2655c9293087bba08cf2f0c9.tar.gz nx-libs-1fd8551f1632efbc2655c9293087bba08cf2f0c9.tar.bz2 nx-libs-1fd8551f1632efbc2655c9293087bba08cf2f0c9.zip | |
Unbrand NX Agent Startup Screen / Brand X2Go Agent Startup Screen (999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch).
When launched with NX Agent flavour, the startup screen gets unbranded by
this patch (the !M logo does not get shown).
When launched with X2Go Agent flavour, the startup screen gets branded
with the X2GO logo.
Diffstat (limited to 'nx-X11/programs/Xserver/os/oscolor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/oscolor.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/os/oscolor.c b/nx-X11/programs/Xserver/os/oscolor.c index d18e7b647..e8692a92c 100644 --- a/nx-X11/programs/Xserver/os/oscolor.c +++ b/nx-X11/programs/Xserver/os/oscolor.c @@ -53,7 +53,19 @@ SOFTWARE. #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 |