[gnome-settings-daemon/gnome-3-10] power: Fix the composite device percentage with a single battery

[Rui Matos <rtcm src gnome org>]

commit a4385bad5a70bcbb6b3b77ea9efdbff20ad3c12c
Author: Rui Matos <tiagomatos gmail com>
Date:   Tue Nov 12 19:49:18 2013 +0100

    power: Fix the composite device percentage with a single battery
    
    This hunk got moved in 6680d0f0812935fa982c2645930e6f0f4c1d93ed by
    mistake. Move it back.

 plugins/power/gsd-power-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 7980a11..2887d52 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -725,6 +725,10 @@ engine_update_composite_device (GsdPowerManager *manager)
                 goto out;
         }
 
+        /* use percentage weighted for each battery capacity */
+        if (energy_full_total > 0.0)
+                percentage = 100.0 * energy_total / energy_full_total;
+
         /* set composite state */
         if (is_discharging)
                 state = UP_DEVICE_STATE_DISCHARGING;
@@ -738,10 +742,6 @@ engine_update_composite_device (GsdPowerManager *manager)
         if (battery_devices == 1)
                 goto out;
 
-        /* use percentage weighted for each battery capacity */
-        if (energy_full_total > 0.0)
-                percentage = 100.0 * energy_total / energy_full_total;
-
         /* calculate a quick and dirty time remaining value */
         if (energy_rate_total > 0) {
                 if (state == UP_DEVICE_STATE_DISCHARGING)