aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-16 12:55:28 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:12:39 +0200
commitb04b58badd9007cc92cb9fc68ecb85c3e3388e25 (patch)
tree83a44b6fa8ebacac91254fadba6a85c37ddf78ac
parent2228513a66870198af2e0c792660c8f6f27e6edf (diff)
downloadnx-libs-b04b58badd9007cc92cb9fc68ecb85c3e3388e25.tar.gz
nx-libs-b04b58badd9007cc92cb9fc68ecb85c3e3388e25.tar.bz2
nx-libs-b04b58badd9007cc92cb9fc68ecb85c3e3388e25.zip
nxagent: add NXAGENT_ONSTART where missing
There were some locations referenceing a variable that was only availabe with NXAGENT_ONSTART set
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c6
2 files changed, 8 insertions, 0 deletions
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;
}