[X2Go-Commits] [nx-libs] 23/108: Call checkX2goAgent much earlier (in ddxProcessArgument) and adapt NXAGENTWINDOWNAMELENGTH to its result.
git-admin at x2go.org
git-admin at x2go.org
Fri Nov 9 20:35:35 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit 373836468b2c21f1c3706e521a603b9dba9dd41a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Apr 14 03:05:17 2018 +0200
Call checkX2goAgent much earlier (in ddxProcessArgument) and adapt NXAGENTWINDOWNAMELENGTH to its result.
---
nx-X11/programs/Xserver/hw/nxagent/Args.c | 15 ++++++++++++++-
nx-X11/programs/Xserver/hw/nxagent/Init.c | 7 +------
nx-X11/programs/Xserver/hw/nxagent/Init.h | 1 +
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 801ee0b..cdcde12 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");
+ }
}
/*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c
index 12f7f0b..01acbbc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c
@@ -192,7 +192,7 @@ int nxagentX2go;
* Checking if agent is x2go agent
*/
-void checkX2goAgent()
+void checkX2goAgent(void)
{
extern const char *nxagentProgName;
if( strcasecmp(nxagentProgName,"x2goagent") == 0)
@@ -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.
*/
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h
index 34a1706..1bea176 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
@@ -46,6 +46,7 @@ extern int nxagentBackingStore;
extern int nxagentSaveUnder;
extern int nxagentX2go;
+void checkX2goAgent(void);
extern ServerGrabInfoRec nxagentGrabServerInfo;
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list