[gnome-power-manager] Don't show a discharging battery notififcation on each battery, just the global battery

[Richard Hughes <rhughes src gnome org>]

commit 7f5b5fad55368f4ec9d9f2e825afc059c211d02d
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 13 11:05:27 2009 +0100

    Don't show a discharging battery notififcation on each battery, just the global battery

 src/gpm-engine.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/gpm-engine.c b/src/gpm-engine.c
index 9e630bc..29874c3 100644
--- a/src/gpm-engine.c
+++ b/src/gpm-engine.c
@@ -831,6 +831,14 @@ gpm_engine_device_changed_cb (DkpClient *client, DkpDevice *device, GpmEngine *e
 	/* get device properties */
 	g_object_get (device,
 		      "type", &type,
+		      NULL);
+
+	/* if battery then use composite device to cope with multiple batteries */
+	if (type == DKP_DEVICE_TYPE_BATTERY)
+		device = gpm_engine_update_composite_device (engine, device);
+
+	/* get device properties */
+	g_object_get (device,
 		      "state", &state,
 		      NULL);
 
@@ -851,10 +859,6 @@ gpm_engine_device_changed_cb (DkpClient *client, DkpDevice *device, GpmEngine *e
 		g_object_set_data (G_OBJECT(device), "engine-state-old", GUINT_TO_POINTER(state));
 	}
 
-	/* if battery then use composite device to cope with multiple batteries */
-	if (type == DKP_DEVICE_TYPE_BATTERY)
-		device = gpm_engine_update_composite_device (engine, device);
-
 	/* check the warning state has not changed */
 	warning_old = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(device), "engine-warning-old"));
 	warning = gpm_engine_get_warning (engine, device);