[gnome-settings-daemon/gnome-3-8] power: Remove pre-dim brightness hack

[Bastien Nocera <hadess src gnome org>]

commit c22a2dd6b7e9482127040dc892cd421d7e8a96f7
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Apr 20 15:21:44 2013 +0200

    power: Remove pre-dim brightness hack
    
    We were trying to work-around the fact that switching to the
    VT on some laptops re-enabled the backlight.
    
    The backlight level is however incorrect when DPMS mode off, and
    checking the level of the backlight, when DPMS is still on, caused
    races.
    
    Linux kernel 3.10 will remove the need for VT switching which will
    fix this bug properly:
    http://blog.ffwll.ch/2013/04/neat-drmi915-stuff-for-310.html
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696379
    
    Conflicts:
        plugins/power/test.py

 plugins/power/gsd-power-manager.c |   22 ----------------------
 plugins/power/test.py             |    3 ---
 2 files changed, 0 insertions(+), 25 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 2f85f0b..5e2e604 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -192,7 +192,6 @@ struct GsdPowerManagerPrivate
         /* Brightness */
         gboolean                 backlight_available;
         gint                     pre_dim_brightness; /* level, not percentage */
-        gint                     pre_dpms_brightness;
 
         /* Keyboard */
         GDBusProxy              *upower_kdb_proxy;
@@ -1996,11 +1995,6 @@ backlight_enable (GsdPowerManager *manager)
                 g_error_free (error);
         }
 
-        if (manager->priv->backlight_available &&
-            manager->priv->pre_dpms_brightness != -1) {
-                backlight_set_abs (manager->priv->rr_screen, manager->priv->pre_dpms_brightness, &error);
-                manager->priv->pre_dpms_brightness = -1;
-        }
         g_debug ("TESTSUITE: Unblanked screen");
 }
 
@@ -2010,21 +2004,6 @@ backlight_disable (GsdPowerManager *manager)
         gboolean ret;
         GError *error = NULL;
 
-        /* Save the backlight, if DPMS isn't on yet, so we can capture it */
-#ifndef GSD_MOCK
-        GnomeRRDpmsMode mode;
-
-        if (manager->priv->backlight_available &&
-            gnome_rr_screen_get_dpms_mode (manager->priv->rr_screen, &mode, NULL) &&
-            mode == GNOME_RR_DPMS_ON) {
-                manager->priv->pre_dpms_brightness = backlight_get_abs (manager->priv->rr_screen, NULL);
-        }
-#else
-        manager->priv->pre_dpms_brightness = backlight_get_abs (manager->priv->rr_screen, NULL);
-#endif /* GSD_MOCK */
-        if (manager->priv->pre_dpms_brightness != -1)
-                backlight_set_abs (manager->priv->rr_screen, backlight_get_min (manager->priv->rr_screen), 
NULL);
-
         ret = gnome_rr_screen_set_dpms_mode (manager->priv->rr_screen,
                                              GNOME_RR_DPMS_OFF,
                                              &error);
@@ -3641,7 +3620,6 @@ gsd_power_manager_init (GsdPowerManager *manager)
         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
         manager->priv->inhibit_lid_switch_fd = -1;
         manager->priv->inhibit_suspend_fd = -1;
-        manager->priv->pre_dpms_brightness = -1;
         manager->priv->screensaver_cancellable = g_cancellable_new ();
         manager->priv->bus_cancellable = g_cancellable_new ();
 }
diff --git a/plugins/power/test.py b/plugins/power/test.py
index a587b37..903b95b 100755
--- a/plugins/power/test.py
+++ b/plugins/power/test.py
@@ -337,8 +337,6 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
 
         # blank is supposed to happen straight away
         self.check_blank(2)
-        # check that the brightness is at the minimum
-        self.assertTrue(self.get_brightness() == 0, 'incorrect blank brightness')
 
         # wiggle the mouse now and check for unblank; this is expected to pop up
         # the locked screen saver
@@ -352,7 +350,6 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
 
         # and check for blank after the blank timeout
         self.check_blank(10)
-        self.assertTrue(self.get_brightness() == 0, 'incorrect blank brightness')
 
         # Drop inhibitor
         self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))