[X2Go-Commits] [nx-libs] 150/429: nxagent: make nxagentSkipImage 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 90178b54883fc687b12574f19cd714e822a7d22c
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Dec 31 00:49:38 2020 +0100

    nxagent: make nxagentSkipImage a Boolean
---
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
index b1df83d3b..f28eb1945 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -123,7 +123,7 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel);
 unsigned long nxagentGetDrawableColor(DrawablePtr pDrawable);
 unsigned long nxagentGetRegionColor(DrawablePtr pDrawable, RegionPtr pRegion);
 
-int nxagentSkipImage = 0;
+Bool nxagentSkipImage = False;
 
 static int nxagentTooManyImageData(void)
 {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index e6a368b9a..cbe66cd90 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -153,7 +153,7 @@ struct _DispatchRec nxagentDispatch = { UNDEFINED, 0, 0, 0 };
  * server.
  */
 
-extern int nxagentSkipImage;
+extern Bool nxagentSkipImage;
 
 void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
 {
@@ -350,7 +350,7 @@ void nxagentBlockHandler(void * data, struct timeval **timeout, void * mask)
                            nxagentCorruptedBackgrounds > 0 ||
                                nxagentCorruptedPixmaps > 0));
 
-    if (nxagentSkipImage == 0 && synchronize == 1)
+    if (!nxagentSkipImage && synchronize == 1)
     {
       #ifdef TEST
       fprintf(stderr, "nxagentBlockHandler: Setting a zero timeout with [%d][%d][%d] and "

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