Index: gnome-power-manager-2.30.1/data/gnome-power-manager.schemas.in
===================================================================
--- gnome-power-manager-2.30.1.orig/data/gnome-power-manager.schemas.in	2010-04-26 11:06:11.000000000 +0200
+++ gnome-power-manager-2.30.1/data/gnome-power-manager.schemas.in	2010-07-14 16:06:25.728488459 +0200
@@ -639,7 +639,7 @@
       <key>/schemas/apps/gnome-power-manager/timeout/sleep_computer_battery</key>
       <applyto>/apps/gnome-power-manager/timeout/sleep_computer_battery</applyto>
       <type>int</type>
-      <default>0</default>
+      <default>1800</default>
       <locale name="C">
         <short>Sleep timeout computer when on battery</short>
         <long>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</long>
@@ -661,7 +661,7 @@
       <key>/schemas/apps/gnome-power-manager/timeout/sleep_computer_ups</key>
       <applyto>/apps/gnome-power-manager/timeout/sleep_computer_ups</applyto>
       <type>int</type>
-      <default>0</default>
+      <default>1800</default>
       <locale name="C">
         <short>Sleep timeout computer when on UPS</short>
         <long>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep.</long>
@@ -672,7 +672,7 @@
       <key>/schemas/apps/gnome-power-manager/timeout/sleep_display_ac</key>
       <applyto>/apps/gnome-power-manager/timeout/sleep_display_ac</applyto>
       <type>int</type>
-      <default>1800</default>
+      <default>900</default>
       <locale name="C">
         <short>Sleep timeout display when on AC</short>
         <long>The amount of time in seconds before the display goes to sleep when the computer is on AC power.</long>
Index: gnome-power-manager-2.30.1/src/gpm-prefs-core.c
===================================================================
--- gnome-power-manager-2.30.1.orig/src/gpm-prefs-core.c	2010-07-14 16:06:25.568501645 +0200
+++ gnome-power-manager-2.30.1/src/gpm-prefs-core.c	2010-07-14 16:07:39.189782771 +0200
@@ -661,6 +661,7 @@
 		{1*60,
 		 5*60,
 		 10*60,
+		 15*60,
 		 30*60,
 		 1*60*60,
 		 0, /* never */
