[gnome-settings-daemon/gbsneto/upstreamingfest] power: Increase blank delay for screensaver

[Benjamin Berg <bberg src gnome org>]

commit a8f15555763d7d918d39d7c1de4982091eefa872
Author: Roddy Shuler <roddy endlessm com>
Date:   Wed Jul 22 12:51:38 2015 -0700

    power: Increase blank delay for screensaver
    
    Upon waking from a screen lock, if the user stops typing,
    the password screen is only displayed for 15 seconds.
    This can be a bit confusing to users, especially if using
    an external display that takes several seconds to wake up.
    
    Bump this timeout up to 30 seconds.

 plugins/power/gsd-power-constants.h | 2 +-
 plugins/power/meson.build           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/power/gsd-power-constants.h b/plugins/power/gsd-power-constants.h
index fd6b5668..91e2296a 100644
--- a/plugins/power/gsd-power-constants.h
+++ b/plugins/power/gsd-power-constants.h
@@ -18,7 +18,7 @@
  */
 
 /* The blank delay when the screensaver is active */
-#define SCREENSAVER_TIMEOUT_BLANK                       15 /* seconds */
+#define SCREENSAVER_TIMEOUT_BLANK                       30 /* seconds */
 
 /* The dim delay when dimming on idle is requested but idle-delay
  * is set to "Never" */
diff --git a/plugins/power/meson.build b/plugins/power/meson.build
index 8babf97f..5b9fa2f5 100644
--- a/plugins/power/meson.build
+++ b/plugins/power/meson.build
@@ -143,7 +143,7 @@ foreach i : [ 1, 2, 3, 4, 5, 6, 7, 8 ]
     test_py,
     args: [ 'PowerPluginTest@0@'.format(i) ],
     env: envs,
-    timeout: 100
+    timeout: 120
   )
 endforeach