[gnome-settings-daemon/wip/hadess/force-screensaver-power-saver: 2/2] power: Respect dim screen settings

[Bastien Nocera <hadess src gnome org>]

commit 4b0ea24fb6a2f56cbcc429742b2751cf33bdf16b
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jul 29 12:05:40 2021 +0200

    power: Respect dim screen settings
    
    The dim screen settings in the UI was not well respected:
    - it only worked on discharging laptops
      (https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/837)
    - it was forced when battery was low when it might have been unwanted
      (https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/232)
    
    Respect the user preference and dim in all circumstances.

 plugins/power/gsd-power-manager.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index f0ed511e..97cd8ea6 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -1902,9 +1902,7 @@ idle_configure (GsdPowerManager *manager)
         timeout_dim = 0;
         if (manager->screensaver_active) {
                 /* Don't dim when the screen lock is active */
-        } else if (!on_battery) {
-                /* Don't dim when charging */
-        } else if (manager->battery_is_low ||
+        } else if ((manager->battery_is_low && !manager->power_profiles_proxy) ||
                    manager->power_saver_enabled) {
                 /* Aggressively blank when battery is low */
                 timeout_dim = SCREENSAVER_TIMEOUT_BLANK;