This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 74c6faf9c9be7b7b7ed94ba7d6ea4400552979d8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Mar 7 07:21:00 2018 +0100 Add more debugging code printing out changes to ScreenSaverTime. --- nx-X11/programs/Xserver/dix/dispatch.c | 8 ++++++-- nx-X11/programs/Xserver/dix/main.c | 1 + nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 ++ nx-X11/programs/Xserver/hw/nxagent/Screen.c | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 3c79146..8a78ff6 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -3217,10 +3217,14 @@ ProcSetScreenSaver (register ClientPtr client) else ScreenSaverAllowExposures = exposureOption; - if (stuff->timeout >= 0) + if (stuff->timeout >= 0) { + fprintf(stderr, "DPMSDEBUG: previous ScreenSaverTime %u; resetting to value %u\n", ScreenSaverTime, stuff->timeout * MILLI_PER_SECOND); ScreenSaverTime = stuff->timeout * MILLI_PER_SECOND; - else + } + else { + fprintf(stderr, "DPMSDEBUG: previous ScreenSaverTime %u; resetting to value defaultScreenSaverTime %u\n", ScreenSaverTime, defaultScreenSaverTime); ScreenSaverTime = defaultScreenSaverTime; + } if (stuff->interval >= 0) ScreenSaverInterval = stuff->interval * MILLI_PER_SECOND; else diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index d425872..de2418f 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -215,6 +215,7 @@ main(int argc, char *argv[], char *envp[]) while(1) { serverGeneration++; + fprintf(stderr, "DPMSDEBUG: previous ScreenSaverTime %u, initializing to defaultScreenSaverTime %u\n", ScreenSaverTime, defaultScreenSaverTime); ScreenSaverTime = defaultScreenSaverTime; ScreenSaverInterval = defaultScreenSaverInterval; ScreenSaverBlanking = defaultScreenSaverBlanking; diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 44b1033..1c7a86e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -1135,10 +1135,12 @@ ProcSetScreenSaver (register ClientPtr client) if (stuff->timeout >= 0) { + fprintf(stderr, "DPMSDEBUG: previous ScreenSaverTime %u, setting to new value %u\n", ScreenSaverTime, stuff->timeout * MILLI_PER_SECOND); ScreenSaverTime = stuff->timeout * MILLI_PER_SECOND; } else { + fprintf(stderr, "DPMSDEBUG: previous ScreenSaverTime %u, setting to defaultScreenSaverTime %u\n", ScreenSaverTime, defaultScreenSaverTime); ScreenSaverTime = defaultScreenSaverTime; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 628bf99..add17dd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -482,6 +482,7 @@ void nxagentSetScreenSaverTime(void) if (nxagentAutoDisconnectTimeout > 0) { + fprintf(stderr, "DPMSDEBUG: nxagentAutoDisconnectTimeout %u > 0, will reset ScreenSaverTime %u to this value\n", nxagentAutoDisconnectTimeout, ScreenSaverTime); ScreenSaverTime = nxagentAutoDisconnectTimeout; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git