gnome-power-manager r3159 - in trunk: . libdevkit-power src

[rhughes svn gnome org]

Author: rhughes
Date: Thu Jan 15 12:00:06 2009
New Revision: 3159
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3159&view=rev

Log:
2009-01-15  Richard Hughes  <richard hughsie com>

* libdevkit-power/dkp-device.c: (dkp_device_get_history),
(dkp_device_get_statistics):
* src/gpm-brightness-kbd.c: (gpm_brightness_kbd_finalize):
Fix up some warnings from static analysis


Modified:
   trunk/ChangeLog
   trunk/libdevkit-power/dkp-device.c
   trunk/src/gpm-brightness-kbd.c

Modified: trunk/libdevkit-power/dkp-device.c
==============================================================================
--- trunk/libdevkit-power/dkp-device.c	(original)
+++ trunk/libdevkit-power/dkp-device.c	Thu Jan 15 12:00:06 2009
@@ -282,8 +282,8 @@
 	EggObjList *array = NULL;
 	gboolean ret;
 
-	g_return_val_if_fail (DKP_IS_DEVICE (device), FALSE);
-	g_return_val_if_fail (device->priv->proxy_device != NULL, FALSE);
+	g_return_val_if_fail (DKP_IS_DEVICE (device), NULL);
+	g_return_val_if_fail (device->priv->proxy_device != NULL, NULL);
 
 	g_type_gvalue_array = dbus_g_type_get_collection ("GPtrArray",
 					dbus_g_type_get_struct("GValueArray",
@@ -360,8 +360,8 @@
 	EggObjList *array = NULL;
 	gboolean ret;
 
-	g_return_val_if_fail (DKP_IS_DEVICE (device), FALSE);
-	g_return_val_if_fail (device->priv->proxy_device != NULL, FALSE);
+	g_return_val_if_fail (DKP_IS_DEVICE (device), NULL);
+	g_return_val_if_fail (device->priv->proxy_device != NULL, NULL);
 
 	g_type_gvalue_array = dbus_g_type_get_collection ("GPtrArray",
 					dbus_g_type_get_struct("GValueArray",

Modified: trunk/src/gpm-brightness-kbd.c
==============================================================================
--- trunk/src/gpm-brightness-kbd.c	(original)
+++ trunk/src/gpm-brightness-kbd.c	Thu Jan 15 12:00:06 2009
@@ -509,8 +509,7 @@
 	g_return_if_fail (GPM_IS_BRIGHTNESS_KBD (object));
 	brightness = GPM_BRIGHTNESS_KBD (object);
 
-	if (brightness->priv->udi != NULL)
-		g_free (brightness->priv->udi);
+	g_free (brightness->priv->udi);
 	if (brightness->priv->gproxy != NULL)
 		g_object_unref (brightness->priv->gproxy);
 	if (brightness->priv->sensor != NULL)