gnome-power-manager r3372 - in trunk: . data src

[rhughes svn gnome org]

Author: rhughes
Date: Mon Mar 23 14:22:45 2009
New Revision: 3372
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3372&view=rev

Log:
2009-03-23  Richard Hughes  <richard hughsie com>

* data/gnome-power-manager.schemas.in:
* src/gpm-common.h:
Remove unused GConf keys.


Modified:
   trunk/ChangeLog
   trunk/data/gnome-power-manager.schemas.in
   trunk/src/gpm-common.h

Modified: trunk/data/gnome-power-manager.schemas.in
==============================================================================
--- trunk/data/gnome-power-manager.schemas.in	(original)
+++ trunk/data/gnome-power-manager.schemas.in	Mon Mar 23 14:22:45 2009
@@ -312,18 +312,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-power-manager/general/debug</key>
-      <applyto>/apps/gnome-power-manager/general/debug</applyto>
-      <owner>gnome-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>If extra debugging messages should be used</short>
-        <long>If extra debugging messages should be used. Only turn this on for debugging.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-power-manager/general/use_profile_time</key>
       <applyto>/apps/gnome-power-manager/general/use_profile_time</applyto>
       <owner>gnome-power-manager</owner>
@@ -336,18 +324,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-power-manager/general/invalid_timeout</key>
-      <applyto>/apps/gnome-power-manager/general/invalid_timeout</applyto>
-      <owner>gnome-power-manager</owner>
-      <type>int</type>
-      <default>500</default>
-      <locale name="C">
-        <short>The invalid timeout for power actions</short>
-        <long>The invalid timeout in ms for power actions. Set this longer if you get 'battery critical' messages when you unplug.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-power-manager/general/ignore_inhibit_requests</key>
       <applyto>/apps/gnome-power-manager/general/ignore_inhibit_requests</applyto>
       <owner>gnome-power-manager</owner>
@@ -360,17 +336,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-power-manager/general/policy_suppression_timeout</key>
-      <applyto>/apps/gnome-power-manager/general/policy_suppression_timeout</applyto>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-        <short>Number of seconds to suppress policy after resume</short>
-        <long>After resume, gnome-power-manager will suppress policy actions for a number of seconds to allow messages to settle and HAL to refresh. Commonly five seconds is enough while not being so long that the user gets confused.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-power-manager/general/use_time_for_policy</key>
       <applyto>/apps/gnome-power-manager/general/use_time_for_policy</applyto>
       <owner>gnome-power-manager</owner>

Modified: trunk/src/gpm-common.h
==============================================================================
--- trunk/src/gpm-common.h	(original)
+++ trunk/src/gpm-common.h	Mon Mar 23 14:22:45 2009
@@ -88,7 +88,6 @@
 #define GPM_CONF_BUTTON_POWER			GPM_CONF_DIR "/buttons/power"
 
 /* general */
-#define GPM_CONF_DEBUG				GPM_CONF_DIR "/general/debug"
 #define GPM_CONF_SCHEMA_VERSION			GPM_CONF_DIR "/general/installed_schema"
 #define GPM_CONF_CAN_SUSPEND			GPM_CONF_DIR "/general/can_suspend"
 #define GPM_CONF_CAN_HIBERNATE			GPM_CONF_DIR "/general/can_hibernate"
@@ -96,9 +95,7 @@
 #define GPM_CONF_USE_PROFILE_TIME		GPM_CONF_DIR "/general/use_profile_time"
 #define GPM_CONF_NETWORKMANAGER_SLEEP		GPM_CONF_DIR "/general/network_sleep"
 #define GPM_CONF_IDLE_CHECK_CPU			GPM_CONF_DIR "/general/check_type_cpu"
-#define GPM_CONF_INVALID_TIMEOUT		GPM_CONF_DIR "/general/invalid_timeout"
 #define GPM_CONF_LAPTOP_USES_EXT_MON		GPM_CONF_DIR "/general/using_external_monitor"
-#define GPM_CONF_POLICY_TIMEOUT			GPM_CONF_DIR "/general/policy_suppression_timeout"
 #define GPM_CONF_IGNORE_INHIBITS		GPM_CONF_DIR "/general/ignore_inhibit_requests"
 
 /* keyboard */