From 111ac2eed54438971554bd71115316472f1c9976 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 9 Feb 2021 19:31:20 +0100
Subject: nxagent: make X2GO support optional

---
 nx-X11/programs/Xserver/hw/nxagent/Args.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 72d6d050c..9ecf2fb8a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -197,10 +197,12 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     nxagentProgName = strdup(basename(basec));
     SAFE_free(basec);
 
+#ifdef X2GO
     /*
      * Check if we are running as X2Go Agent
      */
     checkX2goAgent();
+#endif
   }
 
   #ifdef TEST
@@ -691,6 +693,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
     {
       SAFE_free(nxagentKeyboard);
 
+#ifdef X2GO
       if (nxagentX2go && strcmp(argv[i], "null/null") == 0)
       {
         #ifdef TEST
@@ -701,6 +704,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
         nxagentKeyboard = strdup("clone");
       }
       else
+#endif
       {
         nxagentKeyboard = strdup(argv[i]);
       }
@@ -1775,11 +1779,13 @@ N/A
 
     if (*nxagentWindowName == '\0')
     {
+#ifdef X2GO
       if(nxagentX2go)
       {
         snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "X2Go Agent");
       }
       else
+#endif
       {
         snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "NX Agent");
       }
-- 
cgit v1.2.3