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 b04b58badd9007cc92cb9fc68ecb85c3e3388e25 Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Aug 16 12:55:28 2019 +0200 nxagent: add NXAGENT_ONSTART where missing There were some locations referenceing a variable that was only availabe with NXAGENT_ONSTART set --- nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 ++ nx-X11/programs/Xserver/hw/nxagent/Splash.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 7020a679e..c49cae51e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -141,7 +141,9 @@ void nxagentWaitDisplay(void); void nxagentListRemoteFonts(const char *, int); +#ifdef NXAGENT_ONSTART unsigned int nxagentWMtimeout = 0; +#endif Bool nxagentWMPassed = False; /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index c3f6f101e..6fa092a7d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -72,7 +72,9 @@ static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height * From Screen.c. */ +#ifdef NXAGENT_ONSTART extern Atom nxagentReadyAtom; +#endif /* * From Clipboard.c. @@ -106,7 +108,9 @@ void nxagentShowSplashWindow(Window parentWindow) } #endif + #ifdef NXAGENT_ONSTART XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, None, CurrentTime); + #endif nxagentWMPassed = False; @@ -401,8 +405,10 @@ void nxagentRemoveSplashWindow(void) if (!nxagentWMPassed) { + #ifdef NXAGENT_ONSTART XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, nxagentDefaultWindows[0], CurrentTime); + #endif nxagentWMPassed = True; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git