Merge lp:~1vd1jn0oc/indicator-power/primary-battery-fix into lp:~jjardon/indicator-power/master

[David Schlenk]

Changes the method of determining the primary battery device from the device that has the least time left in terms of charge remaining, to the one with the most. I personally don't care if my tiny second battery has run down if the big main one has 3 hours left on it. Alternatives would be to show charge level as a sum of all devices or display a meter for each device present. This being a ~12 character patch is a good start IMO.

[Charles Kerr (charlesk)]

Hm, on the one hand, I like this patch. On the other hand, the design spec's update now details what we should do when >1 battery is present, and this patch doesn't follow the spec any more than the current behavior does.

review: Disapprove

[Charles Kerr (charlesk)]

Ah, NVM, didn't see this was proposed for jjardon's branch. Please ignore my meddling :)

Unmerged revisions

124. By David Schlenk <email address hidden> on 2011-12-20

Instead of picking the primary battery device by which has the least time
left in terms of charge remaining, pick the one with the most. I don't care
if my tiny second battery has run down if the big main one has 3 hours left
on it. YMMV.

=== modified file 'src/indicator-power.c'
--- src/indicator-power.c	2011-11-08 21:38:58 +0000
+++ src/indicator-power.c	2011-12-20 06:22:25 +0000
@@ -620,7 +620,7 @@
   gchar *device_icon;
   gdouble percentage;
   guint64 time;
-  guint64 min_discharging_time = G_MAXUINT64;
+  guint64 max_discharging_time = 0;
   guint64 max_charging_time = 0;
   gsize n_devices;
   guint i;
@@ -655,9 +655,9 @@
       if (state == UP_DEVICE_STATE_DISCHARGING)
         {
           discharging = TRUE;
-          if (time < min_discharging_time)
+          if (time > max_discharging_time)
             {
-              min_discharging_time = time;
+              max_discharging_time = time;
               primary_device_discharging = device;
             }
         }