[gnome-settings-daemon] power: The idle delay doesn't matter for sleep timeout

[Bastien Nocera <hadess src gnome org>]

commit 3dbcbdb05b958ccbce5bcc35d00864600d895c4b
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jan 17 20:06:39 2013 +0100

    power: The idle delay doesn't matter for sleep timeout
    
    The idle delay shouldn't matter to when we sleep, both
    g-s-d and gnome-shell should know how to behave when a suspend
    request comes in.

 plugins/power/gsd-power-manager.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 07cc5ed..d49145f 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2646,13 +2646,7 @@ idle_configure (GsdPowerManager *manager)
                           &manager->priv->idle_sleep_id);
 
         if (timeout_sleep != 0) {
-                if (timeout_blank && timeout_blank >= timeout_sleep) {
-                        /* adjust sleep timer to blank timer and allow 2 secs margin delay */
-                        timeout_sleep = timeout_blank + 2;
-                        g_debug ("blank timer >= sleep timer, setting up sleep callback %is", timeout_sleep);
-                } else {
-                        g_debug ("setting up sleep callback %is", timeout_sleep);
-                }
+		g_debug ("setting up sleep callback %is", timeout_sleep);
 
                 manager->priv->idle_sleep_id = gnome_idle_monitor_add_watch (manager->priv->idle_monitor,
                                                                              timeout_sleep * 1000,