From 4a6ca0033c568959123a58914c420ea4b866113a Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Tue, 30 Mar 2021 00:10:47 +0200
Subject: nxagent: make nxagentX2go a Boolean everywhere

also correct ugly if formatting regarding nxagentX2go
---
 nx-X11/programs/Xserver/hw/nxagent/Args.c      | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.h      | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c    | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Splash.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index e134d3be2..b1c0231f1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1788,7 +1788,7 @@ N/A
     if (*nxagentWindowName == '\0')
     {
 #ifdef X2GO
-      if(nxagentX2go)
+      if (nxagentX2go)
       {
         snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "X2Go Agent");
       }
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.h b/nx-X11/programs/Xserver/hw/nxagent/Init.h
index 1b87f2296..f62193358 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Init.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Init.h
@@ -46,7 +46,7 @@ extern int nxagentBackingStore;
 extern int nxagentSaveUnder;
 
 #ifdef X2GO
-extern int nxagentX2go;
+extern Bool nxagentX2go;
 void checkX2goAgent(void);
 #endif
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index 828649e5a..5196e28b7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -35,7 +35,7 @@
 #include "Options.h"
 #include "Keyboard.h"
 #include "Drawable.h"
-#include "Init.h" /* extern int nxagentX2go */
+#include "Init.h" /* extern Bool nxagentX2go */
 #include "Utils.h"
 
 #include <unistd.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 1cc4e5448..31b8b68a3 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -1830,7 +1830,7 @@ N/A
         XClassHint hint;
 
 #ifdef X2GO
-        if(nxagentX2go)
+        if (nxagentX2go)
         {
           hint.res_name = strdup("X2GoAgent");
           hint.res_class = strdup("X2GoAgent");
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index 898868925..d28a96df1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -74,7 +74,7 @@ void nxagentShowSplashWindow(XlibWindow parentWindow)
   /*
    * Show splash window only when running as X2Go Agent
    */
-  if(!nxagentX2go)
+  if (!nxagentX2go)
     return;
 
   #ifdef TEST
-- 
cgit v1.2.3