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

[rhughes svn gnome org]

Author: rhughes
Date: Fri Dec 19 11:48:28 2008
New Revision: 3136
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3136&view=rev

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

* src/gpm-control.c: (gpm_control_allowed_suspend),
(gpm_control_allowed_hibernate):
Make warnings into debug statements.

* src/gpm-devicekit.c: (gpm_devicekit_get_object_description):
Fix a bug where the DeviceKit device descriptions were being
rescaled from mWh to Wh, but DK-p already sends them in Wh.


Modified:
   trunk/ChangeLog
   trunk/src/gpm-control.c
   trunk/src/gpm-devicekit.c

Modified: trunk/src/gpm-control.c
==============================================================================
--- trunk/src/gpm-control.c	(original)
+++ trunk/src/gpm-control.c	Fri Dec 19 11:48:28 2008
@@ -184,7 +184,7 @@
 	fg = gpm_control_check_foreground_console (control);
 	if (conf_ok && hardware_ok && polkit_ok && fg)
 		*can = TRUE;
-	egg_warning ("conf=%i, polkit=%i, fg=%i, can=%i", conf_ok, polkit_ok, fg, *can);
+	egg_debug ("conf=%i, polkit=%i, fg=%i, can=%i", conf_ok, polkit_ok, fg, *can);
 	return TRUE;
 }
 
@@ -217,7 +217,7 @@
 #endif
 	if (conf_ok && hardware_ok && polkit_ok && fg)
 		*can = TRUE;
-	egg_warning ("conf=%i, polkit=%i, fg=%i, can=%i", conf_ok, polkit_ok, fg, *can);
+	egg_debug ("conf=%i, polkit=%i, fg=%i, can=%i", conf_ok, polkit_ok, fg, *can);
 	return TRUE;
 }
 

Modified: trunk/src/gpm-devicekit.c
==============================================================================
--- trunk/src/gpm-devicekit.c	(original)
+++ trunk/src/gpm-devicekit.c	Fri Dec 19 11:48:28 2008
@@ -287,17 +287,17 @@
 	if (obj->type == DKP_DEVICE_TYPE_BATTERY) {
 		if (obj->energy > 0)
 			g_string_append_printf (details, _("<b>Current charge:</b> %.1f Wh\n"),
-						obj->energy / 1000.0f);
+						obj->energy);
 		if (obj->energy_full > 0 &&
 		    obj->energy_full_design != obj->energy_full)
 			g_string_append_printf (details, _("<b>Last full charge:</b> %.1f Wh\n"),
-						obj->energy_full / 1000.0f);
+						obj->energy_full);
 		if (obj->energy_full_design > 0)
 			g_string_append_printf (details, _("<b>Design charge:</b> %.1f Wh\n"),
-						obj->energy_full_design / 1000.0f);
+						obj->energy_full_design);
 		if (obj->energy_rate > 0)
 			g_string_append_printf (details, _("<b>Charge rate:</b> %.1f W\n"),
-						obj->energy_rate / 1000.0f);
+						obj->energy_rate);
 	}
 	if (obj->type == DKP_DEVICE_TYPE_MOUSE ||
 	    obj->type == DKP_DEVICE_TYPE_KEYBOARD) {