diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:58 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:58 +0200 |
| commit | d30ef0340e759378964b75e8143625ecaea245b0 (patch) | |
| tree | 04a7997a7454be7cfce962e259c29fdbbf16f379 /nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original | |
| parent | 25af86cd3aaa61dc4a3d69825aa523177c2229e1 (diff) | |
| download | nx-libs-d30ef0340e759378964b75e8143625ecaea245b0.tar.gz nx-libs-d30ef0340e759378964b75e8143625ecaea245b0.tar.bz2 nx-libs-d30ef0340e759378964b75e8143625ecaea245b0.zip | |
Imported nxagent-3.4.0-3.tar.gznxagent/3.4.0-3
Summary: Imported nxagent-3.4.0-3.tar.gz
Keywords:
Imported nxagent-3.4.0-3.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original index 69ad30d2d..d9da23738 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original +++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c.NX.original @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/. */ /* */ /* NXAGENT, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ @@ -513,6 +513,17 @@ Dispatch(void) * completed. We can now handle our clients. */ + if (serverGeneration > nxagentMaxAllowedResets) + { + #ifdef NX_DEBUG_INPUT + fprintf(stderr, "Session: Session started at '%s' timestamp [%lu].\n", GetTimeAsString(), GetTimeInMillis()); + #else + fprintf(stderr, "Session: Session started at '%s'.\n", GetTimeAsString()); + #endif + + nxagentSessionState = SESSION_UP; + } + #ifdef XKB nxagentInitXkbWrapper(); @@ -596,21 +607,6 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio clientReady[1] = NXAGENT_WAKEUP; } - if (serverGeneration > nxagentMaxAllowedResets && - nxagentSessionState == SESSION_STARTING && - (nxagentOption(Xdmcp) == 0 || nxagentXdmcpUp == 1)) - { - #ifdef NX_DEBUG_INPUT - fprintf(stderr, "Session: Session started at '%s' timestamp [%lu].\n", - GetTimeAsString(), GetTimeInMillis()); - #else - fprintf(stderr, "Session: Session started at '%s'.\n", - GetTimeAsString()); - #endif - - nxagentSessionState = SESSION_UP; - } - #ifdef BLOCKS fprintf(stderr, "[End dispatch]\n"); #endif |