diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 23:54:13 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-24 23:54:13 +0200 |
| commit | d3bbca712dc7109539f9af985fe2d30a7c9b0419 (patch) | |
| tree | 7b1bed6c0ef0845ff84a633eb07285fafd6ee0fd /nx-X11/programs/Xserver/hw/nxagent/Init.c | |
| parent | 930bd283339d899aa0e2e521521ec56959f2a72c (diff) | |
| parent | 31ac5a179dd19d37595217e68921f1b87ec34ed3 (diff) | |
| download | nx-libs-d3bbca712dc7109539f9af985fe2d30a7c9b0419.tar.gz nx-libs-d3bbca712dc7109539f9af985fe2d30a7c9b0419.tar.bz2 nx-libs-d3bbca712dc7109539f9af985fe2d30a7c9b0419.zip | |
Merge branch 'sunweaver-pr/drop-nomachine-icon' into 3.6.x
Attributes GH PR #687: https://github.com/ArcticaProject/nx-libs/pull/687
Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Fri, 24 Aug 2018 21:47:34 +0000 (UTC)
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Init.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 12f7f0b06..d95c4b70f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -192,9 +192,9 @@ int nxagentX2go; * Checking if agent is x2go agent */ -void checkX2goAgent() +void checkX2goAgent(void) { - extern const char *nxagentProgName; + extern char *nxagentProgName; if( strcasecmp(nxagentProgName,"x2goagent") == 0) { fprintf(stderr, "\nrunning as X2Go Agent\n"); @@ -221,11 +221,6 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) #endif /* - * Check if we running as X2Go Agent - */ - checkX2goAgent(); - - /* * Print our pid and version information. */ |