diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-16 13:02:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:27:00 +0200 |
| commit | 60a3c9b0ab58d2ab1574de84b421f0f9e5136b75 (patch) | |
| tree | e11965615910402a95b4880f94d8e673fde5b540 /nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | |
| parent | db4c220b2aef5d2c5a8bc9def2558491ac3d7655 (diff) | |
| download | nx-libs-60a3c9b0ab58d2ab1574de84b421f0f9e5136b75.tar.gz nx-libs-60a3c9b0ab58d2ab1574de84b421f0f9e5136b75.tar.bz2 nx-libs-60a3c9b0ab58d2ab1574de84b421f0f9e5136b75.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.c | 10 |
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); |