[X2Go-Commits] [nx-libs] 01/02: Revert "Add missing DPMS code to WaitForSomething()."
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 6 08:27:31 CET 2018
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 884508a7ccbda8b98fef0fd5f7fa6d438a1981f1
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Mar 6 08:26:06 2018 +0100
Revert "Add missing DPMS code to WaitForSomething()."
This reverts commit b0332c73fd9834f661c6aa3784df373c6994d1c7.
---
nx-X11/programs/Xserver/os/WaitFor.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index a6ba227..9133adf 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -188,7 +188,6 @@ WaitForSomething(int *pClientsReady)
int curclient;
int selecterr;
int nready;
- fd_set devicesReadable;
CARD32 now = 0;
Bool someReady = FALSE;
Bool someNotifyWriteReady = FALSE;
@@ -495,17 +494,13 @@ WaitForSomething(int *pClientsReady)
}
}
- XFD_ANDSET(&devicesReadable, &LastSelectMask, &EnabledDevices);
XFD_ANDSET(&clientsReadable, &LastSelectMask, &AllClients);
XFD_ANDSET(&tmp_set, &LastSelectMask, &NotifyReadFds);
if (XFD_ANYSET(&tmp_set) || someNotifyWriteReady)
HandleNotifyFds();
-#ifdef DPMSExtension
- if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn))
- DPMSSet(DPMSModeOn);
-#endif
- if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
+
+ if (XFD_ANYSET (&clientsReadable))
break;
#ifdef WIN32
/* Windows keyboard and mouse events are added to the input queue
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list