gnome-power-manager r2727 - in trunk: . src

[rhughes svn gnome org]

Author: rhughes
Date: Wed Mar 12 20:47:01 2008
New Revision: 2727
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=2727&view=rev

Log:
2008-03-12  Richard Hughes  <richard hughsie com>

* src/gpm-manager.c: (gpm_manager_action_suspend),
(gpm_manager_action_hibernate):
Remove some dead code.


Modified:
   trunk/ChangeLog
   trunk/src/gpm-manager.c

Modified: trunk/src/gpm-manager.c
==============================================================================
--- trunk/src/gpm-manager.c	(original)
+++ trunk/src/gpm-manager.c	Wed Mar 12 20:47:01 2008
@@ -325,17 +325,6 @@
 	gboolean allowed;
 	GError *error = NULL;
 
-	if (gpm_control_is_policy_timout_valid (manager->priv->control) == FALSE) {
-		/* error msg timeout not valid */
-		gpm_notify_display (manager->priv->notify,
-				    _("Action forbidden"),
-				    _("Policy timeout is not valid. Please wait a few seconds and try again."),
-				    GPM_NOTIFY_TIMEOUT_SHORT,
-				    GPM_STOCK_APP_ICON,
-				    GPM_NOTIFY_URGENCY_NORMAL);
-		return FALSE;
-	}
-
 	/* check if the admin has disabled */
 	gpm_conf_get_bool (manager->priv->conf, GPM_CONF_CAN_SUSPEND, &allowed);
 	if (allowed == FALSE) {
@@ -385,17 +374,6 @@
 	gboolean allowed;
 	GError *error = NULL;
 
-	if (gpm_control_is_policy_timout_valid (manager->priv->control) == FALSE) {
-		/* error msg timeout not valid */
-		gpm_notify_display (manager->priv->notify,
-				    _("Action forbidden"),
-				    _("Policy timeout is not valid. Please wait a few seconds and try again."),
-				    GPM_NOTIFY_TIMEOUT_SHORT,
-				    GPM_STOCK_APP_ICON,
-				    GPM_NOTIFY_URGENCY_NORMAL);
-		return FALSE;
-	}
-
 	/* check if the admin has disabled */
 	gpm_conf_get_bool (manager->priv->conf, GPM_CONF_CAN_HIBERNATE, &allowed);
 	if (allowed == FALSE) {