[gnome-settings-daemon] power: Unblank the easy way on lid open

[Bastien Nocera <hadess src gnome org>]

commit f310b36696ec56437cafa04d933511329296ff8f
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 23 18:44:57 2013 +0100

    power: Unblank the easy way on lid open
    
    Just as we would on resume, just reset the idletime, it'll take
    care of everything for us.

 plugins/power/gsd-power-manager.c |   26 +++-----------------------
 1 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index e389f86..ac14f0d 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2164,9 +2164,6 @@ restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
 static void
 do_lid_open_action (GsdPowerManager *manager)
 {
-        gboolean ret;
-        GError *error = NULL;
-
         /* play a sound, using sounds from the naming spec */
         ca_context_play (manager->priv->canberra_context, 0,
                          CA_PROP_EVENT_ID, "lid-open",
@@ -2174,26 +2171,9 @@ do_lid_open_action (GsdPowerManager *manager)
                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
                          NULL);
 
-        /* ensure we turn the panel back on after lid open */
-        ret = gnome_rr_screen_set_dpms_mode (manager->priv->rr_screen,
-                                             GNOME_RR_DPMS_ON,
-                                             &error);
-        if (!ret) {
-                g_warning ("failed to turn the panel on after lid open: %s",
-                           error->message);
-                g_clear_error (&error);
-        }
-
-        /* only toggle keyboard if present and already toggled off */
-        if (manager->priv->upower_kdb_proxy != NULL &&
-            manager->priv->kbd_brightness_old != -1) {
-                ret = upower_kbd_toggle (manager, &error);
-                if (!ret) {
-                        g_warning ("failed to turn the kbd backlight on: %s",
-                                   error->message);
-                        g_error_free (error);
-                }
-        }
+        /* This might already have happened when resuming, but
+         * if we didn't sleep, we'll need to wake it up */
+        reset_idletime ();
 }
 
 static gboolean