[gnome-power-manager] Remove three unused GConf keys

[Richard Hughes <rhughes src gnome org>]

commit b5d390210e47da1dbe1308f313883b80ba93b57d
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jun 22 10:31:37 2009 +0100

    Remove three unused GConf keys

 data/gnome-power-manager.schemas.in |   36 -----------------------------------
 data/gpm-prefs.ui                   |   30 +++++++++++++++++++++++++++++
 src/gpm-common.h                    |    5 ----
 src/gpm-prefs-core.c                |   13 ------------
 4 files changed, 30 insertions(+), 54 deletions(-)
---
diff --git a/data/gnome-power-manager.schemas.in b/data/gnome-power-manager.schemas.in
index 14ba673..4b84e16 100644
--- a/data/gnome-power-manager.schemas.in
+++ b/data/gnome-power-manager.schemas.in
@@ -490,42 +490,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-power-manager/lowpower/on_ac</key>
-      <applyto>/apps/gnome-power-manager/lowpower/on_ac</applyto>
-      <owner>gnome-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>If the low-power mode should be enabled when on AC</short>
-        <long>If the system low-power mode should be enabled when on AC power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnome-power-manager/lowpower/on_ups</key>
-      <applyto>/apps/gnome-power-manager/lowpower/on_ups</applyto>
-      <owner>gnome-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If the low-power mode should be enabled when on UPS</short>
-        <long>If the system low-power mode should be enabled when on UPS power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/gnome-power-manager/lowpower/on_battery</key>
-      <applyto>/apps/gnome-power-manager/lowpower/on_battery</applyto>
-      <owner>gnome-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If the low-power mode should be enabled when on battery</short>
-        <long>If the system low-power mode should be enabled when on laptop battery power.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-power-manager/notify/perhaps_recall</key>
       <applyto>/apps/gnome-power-manager/notify/perhaps_recall</applyto>
       <owner>gnome-power-manager</owner>
diff --git a/data/gpm-prefs.ui b/data/gpm-prefs.ui
index 53ad877..47b8352 100644
--- a/data/gpm-prefs.ui
+++ b/data/gpm-prefs.ui
@@ -164,6 +164,21 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_ac_spindown">
+                                <property name="label" translatable="yes">Sp_in down hard disks when possible</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -440,6 +455,21 @@
                                 <property name="position">2</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_battery_spindown">
+                                <property name="label" translatable="yes">Sp_in down hard disks when possible</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/src/gpm-common.h b/src/gpm-common.h
index 303f350..096fa07 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -110,11 +110,6 @@ G_BEGIN_DECLS
 #define GPM_CONF_LOCK_GNOME_KEYRING_SUSPEND	GPM_CONF_DIR "/lock/gnome_keyring_suspend"
 #define GPM_CONF_LOCK_GNOME_KEYRING_HIBERNATE	GPM_CONF_DIR "/lock/gnome_keyring_hibernate"
 
-/* low power */
-#define GPM_CONF_LOWPOWER_AC			GPM_CONF_DIR "/lowpower/on_ac"
-#define GPM_CONF_LOWPOWER_BATT			GPM_CONF_DIR "/lowpower/on_battery"
-#define GPM_CONF_LOWPOWER_UPS			GPM_CONF_DIR "/lowpower/on_ups"
-
 /* notify */
 #define GPM_CONF_NOTIFY_PERHAPS_RECALL		GPM_CONF_DIR "/notify/perhaps_recall"
 #define GPM_CONF_NOTIFY_LOW_CAPACITY		GPM_CONF_DIR "/notify/low_capacity"
diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
index 91e0545..943e600 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
@@ -644,19 +644,6 @@ gpm_conf_gconf_key_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *e
 		brightness = gconf_value_get_int (value);
 		gtk_range_set_value (GTK_RANGE (widget), brightness);
 	}
-
-	if (strcmp (entry->key, GPM_CONF_LOWPOWER_AC) == 0) {
-		enabled = gconf_value_get_bool (value);
-		egg_debug ("need to enable checkbox");
-
-	} else if (strcmp (entry->key, GPM_CONF_LOWPOWER_UPS) == 0) {
-		enabled = gconf_value_get_bool (value);
-		egg_debug ("need to enable checkbox");
-
-	} else if (strcmp (entry->key, GPM_CONF_LOWPOWER_BATT) == 0) {
-		enabled = gconf_value_get_bool (value);
-		egg_debug ("need to enable checkbox");
-	}
 }
 
 /** setup the notification page */