aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-16 13:02:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:12:39 +0200
commitab80152370da820cb42f22a500c1342bbb3ca3c8 (patch)
tree13fd2a89846815ba656afc7dc6e11871b7269be2 /nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
parentb04b58badd9007cc92cb9fc68ecb85c3e3388e25 (diff)
downloadnx-libs-ab80152370da820cb42f22a500c1342bbb3ca3c8.tar.gz
nx-libs-ab80152370da820cb42f22a500c1342bbb3ca3c8.tar.bz2
nx-libs-ab80152370da820cb42f22a500c1342bbb3ca3c8.zip
nxagent: move nxagentWMPassed to Splash.c
It is only relevant there.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index c49cae51e..0ad26b0bb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -144,7 +144,6 @@ void nxagentListRemoteFonts(const char *, int);
#ifdef NXAGENT_ONSTART
unsigned int nxagentWMtimeout = 0;
#endif
-Bool nxagentWMPassed = False;
/*
* Timeouts based on screen saver time.
@@ -380,9 +379,9 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
* that the agent is ready.
*/
- if (!nxagentWMPassed && (nxagentWMtimeout < currentDispatch))
+ if (nxagentWMtimeout < currentDispatch)
{
- nxagentRemoveSplashWindow();
+ nxagentRemoveSplashWindow();
}
nxagentClients = nClients;
@@ -590,10 +589,7 @@ ProcReparentWindow(register ClientPtr client)
if (!pWin)
return(BadWindow);
- if (!nxagentWMPassed)
- {
- nxagentRemoveSplashWindow();
- }
+ nxagentRemoveSplashWindow();
pParent = (WindowPtr)SecurityLookupWindow(stuff->parent, client,
DixWriteAccess);