Merge lp:~sforshee/powerd/increase-default-screen-timeout into lp:powerd

[Seth Forshee]

Increase default screen timeout to 60 seconds

Increase default screen timeout to 60 seconds

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/powerd-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/powerd-saucy-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/powerd-ci/58/rebuild

review: Approve (continuous-integration)

[Matt Fischer (mfisch)]

+1

=== modified file 'data/com.canonical.powerd.gschema.xml'
--- data/com.canonical.powerd.gschema.xml	2013-05-24 20:46:13 +0000
+++ data/com.canonical.powerd.gschema.xml	2013-06-12 16:55:37 +0000
@@ -3,7 +3,7 @@
   <schema id="com.canonical.powerd" path="/com/canonical/powerd/">
     <key name="activity-timeout" type="u">
       <range min="5" max="3600"/>
-      <default>30</default>
+      <default>60</default>
       <summary>Timeout in seconds for turning off the screen if there is no user activity</summary>
     </key>
   </schema>

=== modified file 'src/powerd.cpp'
--- src/powerd.cpp	2013-06-11 16:34:33 +0000
+++ src/powerd.cpp	2013-06-12 16:55:37 +0000
@@ -70,9 +70,9 @@
 static gint saved_brightness = 255;
 static gchar *brightness_path;
 
-/* The real default for this is set in the gschema file, but set 30 here
+/* The real default for this is set in the gschema file, but set 60 here
  * as a sanity check */
-static int activity_timeout = 30;
+static int activity_timeout = 60;
 static GMainLoop *main_loop = NULL;
 static guint name_id;