[X2Go-Commits] [nx-libs] 149/429: nxagent: make nxagentForceSynchronization a Boolean

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 48279ae79476e3fb3a9e3f7b215ea59c68288a8e
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Dec 31 00:46:18 2020 +0100

    nxagent: make nxagentForceSynchronization a Boolean
---
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c  | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Drawable.h  | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c    | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c  | 4 ++--
 nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index ad896dd55..b1df83d3b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -99,7 +99,7 @@ int nxagentCorruptedPixmaps     = 0;
 int nxagentCorruptedWindows     = 0;
 int nxagentCorruptedBackgrounds = 0;
 
-int nxagentForceSynchronization = 0;
+Bool nxagentForceSynchronization = False;
 
 _nxagentSynchronizationRec nxagentSynchronization = { (DrawablePtr) NULL, 0, 0, 0, 0, 0 };
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
index 22ffabf7a..e4d3ec96e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.h
@@ -157,7 +157,7 @@ extern int nxagentCorruptedPixmaps;
 extern int nxagentCorruptedWindows;
 extern int nxagentCorruptedBackgrounds;
 
-extern int nxagentForceSynchronization;
+extern Bool nxagentForceSynchronization;
 
 extern RegionPtr nxagentCreateRegion(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
                                   int width, int height);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 256c7c241..c5bdee63b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -660,7 +660,7 @@ static void nxagentSwitchDeferMode(void)
   {
     nxagentLaunchDialog(DIALOG_DISABLE_DEFER_MODE);
 
-    nxagentForceSynchronization = 1;
+    nxagentForceSynchronization = True;
   }
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index cdba83264..e6a368b9a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -310,7 +310,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
      * operation.
      */
 
-    if (nxagentForceSynchronization == 1)
+    if (nxagentForceSynchronization)
     {
       #ifdef TEST
       fprintf(stderr, "nxagentBlockHandler: Going to force a synchronization at %s.\n",
@@ -319,7 +319,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
 
       nxagentSynchronizationLoop(NEVER_BREAK);
 
-      nxagentForceSynchronization = 0;
+      nxagentForceSynchronization = False;
     }
     else if (nxagentUserInput(NULL) == 0 &&
                  !nxagentBlocking &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index d6c659fec..9a7c1cd65 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -624,7 +624,7 @@ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
       return True;
       break;
     case KEYSTROKE_FORCE_SYNCHRONIZATION:
-      nxagentForceSynchronization = 1;
+      nxagentForceSynchronization = True;
       break;
 #ifdef DUMP
     case KEYSTROKE_REGIONS_ON_SCREEN:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git