[gnome-power-manager] Finally remove the CanSuspend and CanHibernate options, now that gnome-session is ported

[Richard Hughes <rhughes src gnome org>]

commit 58c4512ab741b8614dc63baf014172221e8e9ddd
Author: Richard Hughes <richard hughsie com>
Date:   Wed Jul 22 17:10:18 2009 +0100

    Finally remove the CanSuspend and CanHibernate options, now that gnome-session is ported

 src/gpm-manager.c                       |   80 -------------------------------
 src/org.freedesktop.PowerManagement.xml |    9 ----
 2 files changed, 0 insertions(+), 89 deletions(-)
---
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 483d63f..f890ba0 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -534,86 +534,6 @@ gpm_manager_perform_policy (GpmManager  *manager, const gchar *policy_key, const
 }
 
 /**
- * gpm_manager_suspend:
- *
- * Attempt to suspend the system.
- **/
-gboolean
-gpm_manager_suspend (GpmManager *manager, GError **error)
-{
-	gboolean allowed;
-
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-
-	/* check if the admin has disabled */
-	allowed = gconf_client_get_bool (manager->priv->conf, GPM_CONF_CAN_SUSPEND, NULL);
-	if (allowed == FALSE) {
-		g_set_error (error, GPM_MANAGER_ERROR, GPM_MANAGER_ERROR_DENIED, "Suspend denied by gconf policy");
-		return FALSE;
-	}
-
-	/* check to see if we are inhibited */
-	if (gpm_manager_is_inhibit_valid (manager, FALSE, "hibernate") == FALSE)
-		return FALSE;
-
-	return gpm_control_suspend (manager->priv->control, error);
-}
-
-/**
- * gpm_manager_hibernate:
- *
- * Attempt to hibernate the system.
- **/
-gboolean
-gpm_manager_hibernate (GpmManager *manager, GError **error)
-{
-	gboolean allowed;
-
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-
-	/* check if the admin has disabled */
-	allowed = gconf_client_get_bool (manager->priv->conf, GPM_CONF_CAN_HIBERNATE, NULL);
-	if (allowed == FALSE) {
-		g_set_error (error, GPM_MANAGER_ERROR, GPM_MANAGER_ERROR_DENIED, "Hibernate denied by gconf policy");
-		return FALSE;
-	}
-
-	/* check to see if we are inhibited */
-	if (gpm_manager_is_inhibit_valid (manager, FALSE, "hibernate") == FALSE)
-		return FALSE;
-
-	return gpm_control_hibernate (manager->priv->control, error);
-}
-
-/**
- * gpm_manager_can_suspend:
- *
- * If the current session user is able to suspend.
- **/
-gboolean
-gpm_manager_can_suspend (GpmManager *manager, gboolean *can_suspend, GError **error)
-{
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-	return gpm_control_allowed_suspend (manager->priv->control, can_suspend, error);
-}
-
-/**
- * gpm_manager_can_hibernate:
- *
- * If the current session user is able to hibernate.
- **/
-gboolean
-gpm_manager_can_hibernate (GpmManager *manager, gboolean *can_hibernate, GError **error)
-{
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-	return gpm_control_allowed_hibernate (manager->priv->control, can_hibernate, error);
-}
-
-/**
  * gpm_manager_get_preferences_options:
  **/
 gboolean
diff --git a/src/org.freedesktop.PowerManagement.xml b/src/org.freedesktop.PowerManagement.xml
index 74e9b30..b1553fe 100644
--- a/src/org.freedesktop.PowerManagement.xml
+++ b/src/org.freedesktop.PowerManagement.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
   <interface name="org.freedesktop.PowerManagement">
-    <method name="Suspend"></method>
-    <method name="Hibernate"></method>
-    <method name="CanSuspend">
-      <arg type="b" name="can_suspend" direction="out"/>
-    </method>
-    <method name="CanHibernate">
-      <arg type="b" name="can_hibernate" direction="out"/>
-    </method>
-    <!-- G-P-M SPECIFIC -->
     <method name="GetPreferencesOptions">
       <arg type="i" name="capability" direction="out"/>
     </method>