diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-04-14 03:05:17 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 23:53:25 +0200 |
| commit | 373836468b2c21f1c3706e521a603b9dba9dd41a (patch) | |
| tree | c79bd6c745345f0c3b8d54fc7c1bb20d5595aa0c /nx-X11/programs/Xserver/hw/nxagent/Args.c | |
| parent | 4d6bae08291f85794948ec5d7e839a0aa583a32f (diff) | |
| download | nx-libs-373836468b2c21f1c3706e521a603b9dba9dd41a.tar.gz nx-libs-373836468b2c21f1c3706e521a603b9dba9dd41a.tar.bz2 nx-libs-373836468b2c21f1c3706e521a603b9dba9dd41a.zip | |
Call checkX2goAgent much earlier (in ddxProcessArgument) and adapt NXAGENTWINDOWNAMELENGTH to its result.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 801ee0b22..cdcde1224 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -56,6 +56,7 @@ is" without express or implied warranty. #include "servermd.h" #include "opaque.h" +#include "Init.h" #include "Agent.h" #include "Display.h" #include "Args.h" @@ -189,6 +190,11 @@ int ddxProcessArgument(int argc, char *argv[], int i) nxagentProgName = argv[0]; + /* + * Check if we running as X2Go Agent + */ + checkX2goAgent(); + static Bool resetOptions = True; if (resetOptions == True) @@ -1805,7 +1811,14 @@ N/A if (*nxagentWindowName == '\0') { - snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "NX"); + if(nxagentX2go) + { + snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "X2Go Agent"); + } + else + { + snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "NX Agent"); + } } /* |