[X2Go-Commits] [nx-libs] 201/219: NXdispatch.c: move nxagentWMtimeout into the function

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:11:05 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 f39b81d31bc7d0427ea9cca04d0e4a21579d7383
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Aug 16 13:11:38 2019 +0200

    NXdispatch.c: move nxagentWMtimeout into the function
    
    it is only used there, no need for a global variable
---
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index da7a55b69..10616834e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -141,10 +141,6 @@ void nxagentWaitDisplay(void);
 
 void nxagentListRemoteFonts(const char *, int);
 
-#ifdef NXAGENT_ONSTART
-unsigned int nxagentWMtimeout = 0;
-#endif
-
 /*
  * Timeouts based on screen saver time.
  */
@@ -264,12 +260,11 @@ Dispatch(void)
     #ifdef NXAGENT_ONSTART
 
     /*
-     * Set NX_WM property (used by NX client to identify
-     * the agent's window) three seconds since the first
-     * client connects.
+     * Set NX_WM property (used by NX client to identify the agent's
+     * window) three seconds since the first client connects.
      */
 
-    nxagentWMtimeout = GetTimeInMillis() + 3000;
+    unsigned int nxagentWMtimeout = GetTimeInMillis() + 3000;
 
     #endif
 

--
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