[gnome-settings-daemon] power: Show blanking test suite markers when DPMS fails



commit 5c0eac4a1c8b4a891d2e45a6fc32e24d873bef6a
Author: Martin Pitt <martinpitt gnome org>
Date:   Tue Jan 22 08:26:22 2013 +0100

    power: Show blanking test suite markers when DPMS fails
    
    The X.org dummy driver (as well as Xvfb and Xephyr) do not support DPMS. Still
    print the blanking test suite markers when DPMS fails, as it is enough proof
    that the power plugin at least tried.

 plugins/power/gsd-power-manager.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index abf03f6..f1d3d7b 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2433,9 +2433,8 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
                         g_warning ("failed to turn the panel off: %s",
                                    error->message);
                         g_clear_error (&error);
-                } else {
-                        g_debug ("TESTSUITE: Blanked screen");
                 }
+                g_debug ("TESTSUITE: Blanked screen");
 
                 /* only toggle keyboard if present and not already toggled */
                 if (manager->priv->upower_kdb_proxy &&
@@ -2470,9 +2469,9 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
                         g_warning ("failed to turn the panel on: %s",
                                    error->message);
                         g_clear_error (&error);
-                } else {
-                        g_debug ("TESTSUITE: Unblanked screen");
                 }
+                g_debug ("TESTSUITE: Unblanked screen");
+                
                 /* reset brightness if we dimmed */
                 if (manager->priv->pre_dim_brightness >= 0) {
                         ret = backlight_set_abs (manager->priv->rr_screen,
@@ -3284,9 +3283,8 @@ handle_resume_actions (GsdPowerManager *manager)
                 g_warning ("failed to turn the panel on after resume: %s",
                            error->message);
                 g_error_free (error);
-        } else {
-                g_debug ("TESTSUITE: Unblanked screen on resume");
         }
+        g_debug ("TESTSUITE: Unblanked screen on resume");
 
         if (manager->priv->pre_dpms_brightness != -1) {
                 backlight_set_abs (manager->priv->rr_screen, manager->priv->pre_dpms_brightness, &error);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]