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

[rhughes svn gnome org]

Author: rhughes
Date: Tue Dec  2 16:47:44 2008
New Revision: 3115
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3115&view=rev

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

* src/gpm-control.c: (gpm_control_shutdown):
* src/gpm-control.h:
* src/gpm-manager.c: (gpm_manager_is_inhibit_valid),
(gpm_manager_class_init):
* src/gpm-manager.h:
* src/org.freedesktop.PowerManagement.xml:
Rip out shutdown and reboot from public API (use ConsoleKit) and remove
reboot internally. Shutdown remains as we need it for low power.


Modified:
   trunk/ChangeLog
   trunk/src/gpm-control.c
   trunk/src/gpm-control.h
   trunk/src/gpm-manager.c
   trunk/src/gpm-manager.h
   trunk/src/org.freedesktop.PowerManagement.xml

Modified: trunk/src/gpm-control.c
==============================================================================
--- trunk/src/gpm-control.c	(original)
+++ trunk/src/gpm-control.c	Tue Dec  2 16:47:44 2008
@@ -204,51 +204,6 @@
 	return TRUE;
 }
 
-/**
- * gpm_control_allowed_shutdown:
- * @control: This class instance
- * @can: If we can shutdown
- *
- **/
-gboolean
-gpm_control_allowed_shutdown (GpmControl *control,
-			      gboolean   *can,
-			      GError    **error)
-{
-	gboolean polkit_ok = TRUE;
-	gboolean fg;
-	g_return_val_if_fail (can, FALSE);
-	*can = FALSE;
-	fg = gpm_control_check_foreground_console (control);
-	polkit_ok = gpm_control_is_user_privileged (control, "org.freedesktop.hal.power-management.shutdown");
-	if (polkit_ok && fg)
-		*can = TRUE;
-	return TRUE;
-}
-
-/**
- * gpm_control_allowed_reboot:
- * @control: This class instance
- * @can: If we can reboot
- *
- * Stub function -- TODO.
- **/
-gboolean
-gpm_control_allowed_reboot (GpmControl *control,
-			    gboolean   *can,
-			    GError    **error)
-{
-	gboolean polkit_ok = TRUE;
-	gboolean fg;
-	g_return_val_if_fail (can, FALSE);
-	*can = FALSE;
-	fg = gpm_control_check_foreground_console (control);
-	polkit_ok = gpm_control_is_user_privileged (control, "org.freedesktop.hal.power-management.reboot");
-	if (polkit_ok && fg)
-		*can = TRUE;
-	return TRUE;
-}
-
 /* convert the HAL error to a local error */
 static void
 gpm_control_convert_hal_error (GpmControl *control,
@@ -287,23 +242,11 @@
  * Shuts down the computer, saving the session if possible.
  **/
 gboolean
-gpm_control_shutdown (GpmControl *control,
-		      GError    **error)
+gpm_control_shutdown (GpmControl *control, GError **error)
 {
-	gboolean allowed;
 	gboolean ret;
 	gboolean save_session;
 
-	gpm_control_allowed_shutdown (control, &allowed, error);
-	if (allowed == FALSE) {
-		egg_warning ("Cannot shutdown");
-		g_set_error (error,
-			     GPM_CONTROL_ERROR,
-			     GPM_CONTROL_ERROR_GENERAL,
-			     "Cannot shutdown");
-		return FALSE;
-	}
-
 	save_session = gconf_client_get_bool (control->priv->conf, GPM_CONF_SESSION_REQUEST_SAVE, NULL);
 	/* We can set g-p-m to not save the session to avoid confusing new
 	   users. By default we save the session to preserve data. */
@@ -323,43 +266,6 @@
 }
 
 /**
- * gpm_control_reboot:
- * @control: This class instance
- *
- * Reboots the computer, saving the session if possible.
- **/
-gboolean
-gpm_control_reboot (GpmControl *control,
-		    GError    **error)
-{
-	gboolean allowed;
-	gboolean save_session;
-
-	gpm_control_allowed_reboot (control, &allowed, error);
-	if (allowed == FALSE) {
-		egg_warning ("Cannot reboot");
-		g_set_error (error,
-			     GPM_CONTROL_ERROR,
-			     GPM_CONTROL_ERROR_GENERAL,
-			     "Cannot reboot");
-		return FALSE;
-	}
-
-	save_session = gconf_client_get_bool (control->priv->conf, GPM_CONF_SESSION_REQUEST_SAVE, NULL);
-	/* We can set g-p-m to not save the session to avoid confusing new
-	   users. By default we save the session to preserve data. */
-	if (save_session) {
-#if 0
-		gnome_client_request_save (gnome_master_client (),
-					   GNOME_SAVE_GLOBAL,
-					   FALSE, GNOME_INTERACT_NONE, FALSE,  TRUE);
-#endif
-	}
-
-	return hal_device_power_reboot (control->priv->hal_device_power, error);
-}
-
-/**
  * gpm_control_get_lock_policy:
  * @control: This class instance
  * @policy: The policy gconf string.

Modified: trunk/src/gpm-control.h
==============================================================================
--- trunk/src/gpm-control.h	(original)
+++ trunk/src/gpm-control.h	Tue Dec  2 16:47:44 2008
@@ -83,17 +83,12 @@
 gboolean	 gpm_control_allowed_shutdown		(GpmControl	*control,
 							 gboolean	*can,
 							 GError		**error);
-gboolean	 gpm_control_allowed_reboot		(GpmControl	*control,
-							 gboolean	*can,
-							 GError		**error);
 gboolean	 gpm_control_suspend			(GpmControl	*control,
 							 GError		**error);
 gboolean	 gpm_control_hibernate			(GpmControl	*control,
 							 GError		**error);
 gboolean	 gpm_control_shutdown			(GpmControl	*control,
 						 	 GError		**error);
-gboolean	 gpm_control_reboot			(GpmControl	*control,
-						 	 GError		**error);
 gboolean	 gpm_control_get_lock_policy		(GpmControl	*control,
 							 const gchar	*policy);
 

Modified: trunk/src/gpm-manager.c
==============================================================================
--- trunk/src/gpm-manager.c	(original)
+++ trunk/src/gpm-manager.c	Tue Dec  2 16:47:44 2008
@@ -133,8 +133,6 @@
 	POWER_SAVE_STATUS_CHANGED,
 	CAN_SUSPEND_CHANGED,
 	CAN_HIBERNATE_CHANGED,
-	CAN_SHUTDOWN_CHANGED,
-	CAN_REBOOT_CHANGED,
 	LAST_SIGNAL
 };
 
@@ -292,10 +290,6 @@
 				title = g_strdup (_("Request to hibernate")); 
 		else if (strcmp (action, "policy action") == 0)
 				title = g_strdup (_("Request to do policy action")); 
-		else if (strcmp (action, "reboot") == 0)
-				title = g_strdup (_("Request to reboot")); 
-		else if (strcmp (action, "shutdown") == 0)
-				title = g_strdup (_("Request to shutdown")); 
 		else if (strcmp (action, "timeout action") == 0)
 				title = g_strdup (_("Request to do timeout action"));
 		
@@ -666,43 +660,6 @@
 }
 
 /**
- * gpm_manager_reboot:
- *
- * Attempt to restart the system.
- **/
-gboolean
-gpm_manager_reboot (GpmManager *manager, GError **error)
-{
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-
-	/* check to see if we are inhibited */
-	if (gpm_manager_is_inhibit_valid (manager, FALSE, "reboot") == FALSE)
-		return FALSE;
-
-	return gpm_control_reboot (manager->priv->control, error);
-}
-
-/**
- * gpm_manager_shutdown:
- *
- * Attempt to shutdown the system.
- **/
-gboolean
-gpm_manager_shutdown (GpmManager *manager,
-		      GError    **error)
-{
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-
-	/* check to see if we are inhibited */
-	if (gpm_manager_is_inhibit_valid (manager, FALSE, "shutdown") == FALSE)
-		return FALSE;
-
-	return gpm_control_shutdown (manager->priv->control, error);
-}
-
-/**
  * gpm_manager_can_suspend:
  *
  * If the current session user is able to suspend.
@@ -729,32 +686,6 @@
 }
 
 /**
- * gpm_manager_can_reboot:
- *
- * If the current session user is able to reboot.
- **/
-gboolean
-gpm_manager_can_reboot (GpmManager *manager, gboolean *can_reboot, GError **error)
-{
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-	return gpm_control_allowed_reboot (manager->priv->control, can_reboot, error);
-}
-
-/**
- * gpm_manager_can_shutdown:
- *
- * If the current session user is able to shutdown.
- **/
-gboolean
-gpm_manager_can_shutdown (GpmManager *manager, gboolean *can_shutdown, GError **error)
-{
-	g_return_val_if_fail (manager != NULL, FALSE);
-	g_return_val_if_fail (GPM_IS_MANAGER (manager), FALSE);
-	return gpm_control_allowed_shutdown (manager->priv->control, can_shutdown, error);
-}
-
-/**
  * gpm_manager_get_preferences_options:
  **/
 gboolean
@@ -1257,18 +1188,6 @@
 			      G_STRUCT_OFFSET (GpmManagerClass, can_hibernate_changed),
 			      NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
 			      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-	signals [CAN_SHUTDOWN_CHANGED] =
-		g_signal_new ("can-shutdown-changed",
-			      G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (GpmManagerClass, can_shutdown_changed),
-			      NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
-			      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-	signals [CAN_REBOOT_CHANGED] =
-		g_signal_new ("can-reboot-changed",
-			      G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (GpmManagerClass, can_reboot_changed),
-			      NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
-			      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
 	g_type_class_add_private (klass, sizeof (GpmManagerPrivate));
 }

Modified: trunk/src/gpm-manager.h
==============================================================================
--- trunk/src/gpm-manager.h	(original)
+++ trunk/src/gpm-manager.h	Tue Dec  2 16:47:44 2008
@@ -62,10 +62,6 @@
 							 gboolean	 can_suspend);
 	void		(* can_hibernate_changed)	(GpmManager	*manager,
 							 gboolean	 can_hibernate);
-	void		(* can_shutdown_changed)	(GpmManager	*manager,
-							 gboolean	 can_shutdown);
-	void		(* can_reboot_changed)		(GpmManager	*manager,
-							 gboolean	 can_reboot);
 } GpmManagerClass;
 
 typedef enum
@@ -94,10 +90,6 @@
 							 GError		**error);
 gboolean	 gpm_manager_hibernate			(GpmManager	*manager,
 							 GError		**error);
-gboolean	 gpm_manager_reboot			(GpmManager	*manager,
-							 GError		**error);
-gboolean	 gpm_manager_shutdown			(GpmManager	*manager,
-							 GError		**error);
 gboolean	 gpm_manager_can_suspend		(GpmManager	*manager,
 							 gboolean	*can_suspend,
 							 GError		**error);

Modified: trunk/src/org.freedesktop.PowerManagement.xml
==============================================================================
--- trunk/src/org.freedesktop.PowerManagement.xml	(original)
+++ trunk/src/org.freedesktop.PowerManagement.xml	Tue Dec  2 16:47:44 2008
@@ -3,20 +3,12 @@
   <interface name="org.freedesktop.PowerManagement">
     <method name="Suspend"></method>
     <method name="Hibernate"></method>
-    <method name="Reboot"></method>
-    <method name="Shutdown"></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>
-    <method name="CanReboot">
-      <arg type="b" name="can_reboot" direction="out"/>
-    </method>
-    <method name="CanShutdown">
-      <arg type="b" name="can_shutdown" direction="out"/>
-    </method>
     <!-- G-P-M SPECIFIC -->
     <method name="GetPreferencesOptions">
       <arg type="i" name="capability" direction="out"/>
@@ -36,12 +28,6 @@
     <signal name="CanHibernateChanged">
       <arg type="b" name="can_hibernate" direction="out"/>
     </signal>
-    <signal name="CanShutdownChanged">
-      <arg type="b" name="can_shutdown" direction="out"/>
-    </signal>
-    <signal name="CanRebootChanged">
-      <arg type="b" name="can_reboot" direction="out"/>
-    </signal>
     <signal name="OnBatteryChanged">
       <arg type="b" name="on_battery" direction="out"/>
     </signal>