[gnome-settings-daemon] power: Revert increased timeouts with FIXMEs

[Bastien Nocera <hadess src gnome org>]

commit 960b3dab3355e85f02918a6544355aa7166a6b15
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jan 25 13:15:52 2013 +0100

    power: Revert increased timeouts with FIXMEs
    
    Now that we get told about which actions are inhibited,
    we don't need to query gnome-session every time we make a
    change, which means we're faster.
    
    This reverts commit 721130f12391de2d5c14963e4ea10bd2ce9eef94 and
    3c186ed87640f39b942a512013e6497c7245f85f.

 plugins/power/test.py |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/plugins/power/test.py b/plugins/power/test.py
index be8e278..6144b0d 100755
--- a/plugins/power/test.py
+++ b/plugins/power/test.py
@@ -385,8 +385,7 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # Check that we've blanked
         time.sleep(2)
         self.assertTrue(self.obj_screensaver.GetActive(), 'screensaver not turned on')
-	# FIXME: See test_blank_on_lid_close
-        self.check_blank(10)
+        self.check_blank(2)
 
         # Drop the inhibit and see whether we suspend
         self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
@@ -405,10 +404,7 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         self.obj_upower.EmitSignal('', 'Changed', '', [], dbus_interface='org.freedesktop.DBus.Mock')
 
         # Check that we've blanked
-        # FIXME: For some reason, gnome-session is taking a long time asking
-        # logind whether it's inhibited, which is blocking our idle_configure() call
-        # thus the screensaver coming on
-        self.check_blank(10)
+        self.check_blank(4)
 
         # Drop the inhibit and see whether we suspend
         self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
@@ -427,8 +423,7 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         self.obj_upower.EmitSignal('', 'Changed', '', [], dbus_interface='org.freedesktop.DBus.Mock')
 
         # Check that we've blanked
-        # FIXME: See test_blank_on_lid_close
-        self.check_blank(10)
+        self.check_blank(2)
 
         # Reopen the lid
         self.obj_upower.Set('org.freedesktop.UPower', 'LidIsClosed', False)