[X2Go-Commits] [nx-libs] 128/219: Consistently use None instead of 0 for nxagentIconWindow everywhere

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:10:36 CEST 2019


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 d487d5879d10211c5aa536b84073cdf9c64c2fed
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Jun 27 20:15:15 2019 +0200

    Consistently use None instead of 0 for nxagentIconWindow everywhere
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 54aa8f4e0..111fd96d4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -2042,7 +2042,7 @@ N/A
     }
     else
     {
-      nxagentIconWindow = 0;
+      nxagentIconWindow = None;
     }
 
     /*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 3e27ae566..0e5def294 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -2654,7 +2654,7 @@ void nxagentMapDefaultWindows(void)
    * Map the icon window.
    */
 
-  if (nxagentIconWindow != 0)
+  if (nxagentIconWindow != None)
   {
     #ifdef TEST
     fprintf(stderr, "nxagentMapDefaultWindows: Mapping icon window id [%ld].\n",

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


More information about the x2go-commits mailing list