[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Do not activate DPMS changes if the screensaver is not active; improve logging

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 68d4c698abd821ffde4b627c98c7837a36a90e49
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Mar 21 15:21:45 2020 -0400

    Do not activate DPMS changes if the screensaver is not active; improve logging
---
 src/gs-listener-dbus.c |  2 --
 src/gs-manager.c       | 26 ++++++++++++++------------
 src/gs-window-x11.c    |  4 ++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 28af393..4a51566 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -381,8 +381,6 @@ gs_listener_activate_saver (GSListener *listener,
     g_return_val_if_fail (GS_IS_LISTENER (listener), FALSE);
 
     if (listener->priv->active == active) {
-        gs_debug ("Trying to set active state when already: %s",
-                  active ? "active" : "inactive");
         return FALSE;
     }
 
diff --git a/src/gs-manager.c b/src/gs-manager.c
index 0eb2ef3..7a08b50 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -557,17 +557,19 @@ activate_dpms_timeout (GSManager *manager) {
     BOOL state;
     CARD16 power_level;
 
-    if (DPMSInfo(gdk_x11_get_default_xdisplay(), &power_level, &state)) {
-        if (state) {
-            if (power_level == DPMSModeOn) {
-                gs_debug("DPMS: On -> Standby");
-                DPMSForceLevel (gdk_x11_get_default_xdisplay(), DPMSModeStandby);
-                remove_dpms_timer (manager);
-                add_dpms_timer (manager, manager->priv->prefs->dpms_off_timeout);
-                return FALSE;
-            } else if (power_level == DPMSModeStandby || power_level == DPMSModeSuspend) {
-                gs_debug("DPMS: %s -> Off", power_level == DPMSModeStandby ? "Standby" : "Suspend");
-                DPMSForceLevel (gdk_x11_get_default_xdisplay(), DPMSModeOff);
+    if (manager->priv->active) {
+        if (DPMSInfo(gdk_x11_get_default_xdisplay(), &power_level, &state)) {
+            if (state) {
+                if (power_level == DPMSModeOn) {
+                    gs_debug("DPMS: On -> Standby");
+                    DPMSForceLevel (gdk_x11_get_default_xdisplay(), DPMSModeStandby);
+                    remove_dpms_timer (manager);
+                    add_dpms_timer (manager, manager->priv->prefs->dpms_off_timeout);
+                    return FALSE;
+                } else if (power_level == DPMSModeStandby || power_level == DPMSModeSuspend) {
+                    gs_debug("DPMS: %s -> Off", power_level == DPMSModeStandby ? "Standby" : "Suspend");
+                    DPMSForceLevel (gdk_x11_get_default_xdisplay(), DPMSModeOff);
+                }
             }
         }
     }
@@ -593,7 +595,7 @@ add_dpms_timer (GSManager *manager,
     if (timeout == 0)
         return;
 
-    gs_debug ("Scheduling DPMS change after screensaver is idling for %i minute", timeout);
+    gs_debug ("Scheduling DPMS change after screensaver is idling for %i minute(s)", timeout);
     manager->priv->dpms_timeout_id = g_timeout_add (timeout * 60000,
                                                     (GSourceFunc)activate_dpms_timeout,
                                                     manager);
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 8ef16e1..c61564c 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -1602,6 +1602,10 @@ gs_window_set_lock_active (GSWindow *window,
                            gboolean  active) {
     g_return_if_fail (GS_IS_WINDOW (window));
 
+    if (window->priv->lock_active == active) {
+        return;
+    }
+
     gs_debug("Setting lock active: %i", active);
 
     window->priv->lock_active = active;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.