[X2Go-Commits] [nx-libs] 03/30: Don't reset the lastDeviceEventTime when doing DPMS actions

git-admin at x2go.org git-admin at x2go.org
Tue Jul 3 22:23:56 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 222153af4406e74c9d8a8a752ae220663432905d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 3 14:50:32 2018 +0200

    Don't reset the lastDeviceEventTime when doing DPMS actions
    
     Backported from X.org's Xserver:
    
        commit c1d901d723c3bee523736eacc15b44a7dff484fe
        Author: Richard Hughes <richard at hughsie.com>
        Date:   Fri Aug 14 11:44:35 2009 +0100
    
            Don't reset the lastDeviceEventTime when doing DPMS actions
    
            When we change the DPMS mode, don't play games with the last event time as
            this breaks applications using IDLETIME to turn the backlight off after a
            preset time.
    
            This patch fixes gnome-power-manager and xfce-power-manager
    
            Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    
     Backport-to-NX-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---
 nx-X11/programs/Xserver/Xext/dpms.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c
index 74969bb..81bbd51 100644
--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/nx-X11/programs/Xserver/Xext/dpms.c
@@ -232,19 +232,10 @@ ProcDPMSForceLevel(client)
     if (!DPMSEnabled)
 	return BadMatch;
 
-    if (stuff->level == DPMSModeOn) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis();
-    } else if (stuff->level == DPMSModeStandby) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSStandbyTime;
-    } else if (stuff->level == DPMSModeSuspend) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSSuspendTime;
-    } else if (stuff->level == DPMSModeOff) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSOffTime;
-    } else {
+    if (stuff->level != DPMSModeOn &&
+        stuff->level != DPMSModeStandby &&
+        stuff->level != DPMSModeSuspend &&
+        stuff->level != DPMSModeOff) {
 	client->errorValue = stuff->level;
 	return BadValue;
     }

--
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