gnome-power-manager r2762 - in trunk: . src tools

[simonz svn gnome org]

Author: simonz
Date: Mon Apr  7 11:22:04 2008
New Revision: 2762
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=2762&view=rev

Log:
2008-04-07  simon.zheng  <simon zheng sun com>

	* src/gpm-prefs-core.c: (gpm_prefs_setup_action_combo),
	(gpm_prefs_init):
	Check "CanShutdown" before showing option shutdown in 
	preferences, as well as suspend and hibernate. Fixes #526178.
	* tools/gnome-power-bugreport.sh:
	Support Solaris platform. See #526349.



Modified:
   trunk/ChangeLog
   trunk/src/gpm-prefs-core.c
   trunk/tools/gnome-power-bugreport.sh

Modified: trunk/src/gpm-prefs-core.c
==============================================================================
--- trunk/src/gpm-prefs-core.c	(original)
+++ trunk/src/gpm-prefs-core.c	Mon Apr  7 11:22:04 2008
@@ -60,6 +60,7 @@
 	gboolean		 has_ambient;
 	gboolean		 has_button_lid;
 	gboolean		 has_button_suspend;
+	gboolean		 can_shutdown;
 	gboolean		 can_suspend;
 	gboolean		 can_hibernate;
 	GpmConf			*conf;
@@ -500,7 +501,9 @@
 	}
 
 	while (actions[i] != NULL) {
-		if (strcmp (actions[i], ACTION_SHUTDOWN) == 0) {
+		if ((strcmp (actions[i], ACTION_SHUTDOWN) == 0) && !prefs->priv->can_shutdown) {
+			gpm_debug ("Cannot add option, as cannot shutdown.");
+		} else if (strcmp (actions[i], ACTION_SHUTDOWN) == 0 && prefs->priv->can_shutdown) {
 			gtk_combo_box_append_text (GTK_COMBO_BOX (widget),
 						   ACTION_SHUTDOWN_TEXT);
 			n_added++;
@@ -1147,6 +1150,7 @@
 	prefs->priv->has_ambient = ((caps & GPM_PREFS_SERVER_AMBIENT) > 0);
 	prefs->priv->has_button_lid = ((caps & GPM_PREFS_SERVER_LID) > 0);
 	prefs->priv->has_button_suspend = TRUE;
+	prefs->priv->can_shutdown = gpm_dbus_method_bool ("CanShutdown");
 	prefs->priv->can_suspend = gpm_dbus_method_bool ("CanSuspend");
 	prefs->priv->can_hibernate = gpm_dbus_method_bool ("CanHibernate");
 	gpm_debug ("caps=%i", caps);

Modified: trunk/tools/gnome-power-bugreport.sh
==============================================================================
--- trunk/tools/gnome-power-bugreport.sh	(original)
+++ trunk/tools/gnome-power-bugreport.sh	Mon Apr  7 11:22:04 2008
@@ -36,7 +36,7 @@
 }
 
 echo -n "Distro version:       "
-cat /etc/*-release | uniq
+cat /etc/*release | uniq
 
 echo -n "Kernel version:       "
 uname -r
@@ -69,9 +69,18 @@
 echo "Battery Information:"
 lshal | grep "battery\."
 
+OS=`uname -s`
+
 echo "GNOME Power Manager Process Information:"
-ps aux --forest | grep gnome-power | grep -v grep
+if [ "$OS" = "SunOS" ]; then
+	ptree -a `pgrep power`
+else
+	ps aux --forest | grep gnome-power | grep -v grep
+fi
 
 echo "HAL Process Information:"
-ps aux --forest | grep hald | grep -v grep
-
+if [ "$OS" = "SunOS" ]; then
+        ptree -a `pgrep hald`
+else
+	ps aux --forest | grep hald | grep -v grep
+fi