[gnome-power-manager] Remove the udisks integration, it was rejected from the gnome-settings-daemon merge

[Richard Hughes <rhughes src gnome org>]

commit d97a988246d34f4cd38b7ee1335c9b500c7c522f
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 4 12:12:45 2011 +0100

    Remove the udisks integration, it was rejected from the gnome-settings-daemon merge

 data/org.gnome.power-manager.gschema.xml.in |   20 ---
 src/Makefile.am                             |    2 -
 src/gpm-common.h                            |    6 -
 src/gpm-disks.c                             |  226 ---------------------------
 src/gpm-disks.h                             |   57 -------
 src/gpm-manager.c                           |   37 -----
 6 files changed, 0 insertions(+), 348 deletions(-)
---
diff --git a/data/org.gnome.power-manager.gschema.xml.in b/data/org.gnome.power-manager.gschema.xml.in
index 8611416..4d64ed5 100644
--- a/data/org.gnome.power-manager.gschema.xml.in
+++ b/data/org.gnome.power-manager.gschema.xml.in
@@ -82,26 +82,6 @@
       <_summary>Lock GNOME keyring on sleep</_summary>
       <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
     </key>
-    <key name="spindown-enable-ac" type="b">
-      <default>false</default>
-      <_summary>If the low-power mode should be enabled when on AC</_summary>
-      <_description>If the system low-power mode should be enabled when on AC power.</_description>
-    </key>
-    <key name="spindown-enable-battery" type="b">
-      <default>true</default>
-      <_summary>If the low-power mode should be enabled when on battery</_summary>
-      <_description>If the system low-power mode should be enabled when on laptop battery power.</_description>
-    </key>
-    <key name="spindown-timeout-ac" type="i">
-      <default>600</default>
-      <_summary>Seconds of inactivity to spin down when on AC</_summary>
-      <_description>The number of seconds of inactivity to spin down the disks when on AC power.</_description>
-    </key>
-    <key name="spindown-timeout-battery" type="i">
-      <default>60</default>
-      <_summary>Seconds of inactivity to spin down when on battery</_summary>
-      <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description>
-    </key>
     <key name="notify-perhaps-recall" type="b">
       <default>true</default>
       <_summary>If we should show the recalled battery warning for a broken battery</_summary>
diff --git a/src/Makefile.am b/src/Makefile.am
index 820d410..f6db8db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,8 +96,6 @@ gnome_power_manager_SOURCES =				\
 	gpm-backlight.c					\
 	gpm-idle.h					\
 	gpm-idle.c					\
-	gpm-disks.h					\
-	gpm-disks.c					\
 	gpm-control.h					\
 	gpm-control.c					\
 	gpm-button.h					\
diff --git a/src/gpm-common.h b/src/gpm-common.h
index dabda1a..b40204f 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -80,12 +80,6 @@ G_BEGIN_DECLS
 #define GPM_SETTINGS_LOCK_KEYRING_SUSPEND		"lock-keyring-suspend"
 #define GPM_SETTINGS_LOCK_KEYRING_HIBERNATE		"lock-keyring-hibernate"
 
-/* disks */
-#define GPM_SETTINGS_SPINDOWN_ENABLE_AC			"spindown-enable-ac"
-#define GPM_SETTINGS_SPINDOWN_ENABLE_BATT		"spindown-enable-battery"
-#define GPM_SETTINGS_SPINDOWN_TIMEOUT_AC		"spindown-timeout-ac"
-#define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT		"spindown-timeout-battery"
-
 /* notify */
 #define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL		"notify-perhaps-recall"
 #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY		"notify-low-capacity"
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index d0218b3..06442dc 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -54,7 +54,6 @@
 #include "gpm-stock-icons.h"
 #include "gpm-engine.h"
 #include "gpm-upower.h"
-#include "gpm-disks.h"
 
 static const gchar *power_manager_introspection = ""
 "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
@@ -90,7 +89,6 @@ struct GpmManagerPrivate
 	GpmButton		*button;
 	GSettings		*settings;
 	GSettings		*settings_gsd;
-	GpmDisks		*disks;
 	GpmDpms			*dpms;
 	GpmIdle			*idle;
 	GpmControl		*control;
@@ -1078,34 +1076,11 @@ gpm_manager_button_pressed_cb (GpmButton *button, const gchar *type, GpmManager
 }
 
 /**
- * gpm_manager_get_spindown_timeout:
- **/
-static gint
-gpm_manager_get_spindown_timeout (GpmManager *manager)
-{
-	gboolean enabled;
-	gint timeout;
-
-	/* get policy */
-	if (!manager->priv->on_battery) {
-		enabled = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_SPINDOWN_ENABLE_AC);
-		timeout = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SPINDOWN_TIMEOUT_AC);
-	} else {
-		enabled = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_SPINDOWN_ENABLE_BATT);
-		timeout = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT);
-	}
-	if (!enabled)
-		timeout = 0;
-	return timeout;
-}
-
-/**
  * gpm_manager_client_changed_cb:
  **/
 static void
 gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager)
 {
-	gint timeout;
 	gboolean on_battery;
 	gboolean lid_is_closed;
 
@@ -1143,10 +1118,6 @@ gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager)
 
 	g_debug ("on_battery: %d", on_battery);
 
-	/* set disk spindown threshold */
-	timeout = gpm_manager_get_spindown_timeout (manager);
-	gpm_disks_set_spindown_timeout (manager->priv->disks, timeout);
-
 	gpm_manager_sync_policy_sleep (manager);
 
 	gpm_manager_update_ac_throttle (manager);
@@ -2256,8 +2227,6 @@ gpm_manager_name_lost_cb (GDBusConnection *connection,
 static void
 gpm_manager_init (GpmManager *manager)
 {
-	gint timeout;
-
 	manager->priv = GPM_MANAGER_GET_PRIVATE (manager);
 
 	/* init to unthrottled */
@@ -2278,7 +2247,6 @@ gpm_manager_init (GpmManager *manager)
 	manager->priv->notification_warning_low = NULL;
 	manager->priv->notification_discharging = NULL;
 	manager->priv->notification_fully_charged = NULL;
-	manager->priv->disks = gpm_disks_new ();
 	manager->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
 	g_signal_connect (manager->priv->settings, "changed",
 			  G_CALLBACK (gpm_manager_settings_changed_cb), manager);
@@ -2344,10 +2312,6 @@ gpm_manager_init (GpmManager *manager)
 	g_signal_connect (manager->priv->engine, "devices-changed",
 			  G_CALLBACK (gpm_manager_engine_devices_changed_cb), manager);
 
-	/* set disk spindown threshold */
-	timeout = gpm_manager_get_spindown_timeout (manager);
-	gpm_disks_set_spindown_timeout (manager->priv->disks, timeout);
-
 	/* update ac throttle */
 	gpm_manager_update_ac_throttle (manager);
 
@@ -2396,7 +2360,6 @@ gpm_manager_finalize (GObject *object)
 
 	g_object_unref (manager->priv->settings);
 	g_object_unref (manager->priv->settings_gsd);
-	g_object_unref (manager->priv->disks);
 	g_object_unref (manager->priv->dpms);
 	g_object_unref (manager->priv->idle);
 	g_object_unref (manager->priv->engine);