aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-03-30 00:10:47 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:23:36 +0200
commit4a6ca0033c568959123a58914c420ea4b866113a (patch)
treef4fef6fdedc20d183da9eea172be3c6c82a09074
parenta6d018bef8897ccac1b481e14d94f9436841b21a (diff)
downloadnx-libs-4a6ca0033c568959123a58914c420ea4b866113a.tar.gz
nx-libs-4a6ca0033c568959123a58914c420ea4b866113a.tar.bz2
nx-libs-4a6ca0033c568959123a58914c420ea4b866113a.zip
nxagent: make nxagentX2go a Boolean everywhere
also correct ugly if formatting regarding nxagentX2go
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Init.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keystroke.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c2
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