Merge lp:~mdeslaur/indicator-power/indicator-power into lp:indicator-power/15.04

[Marc Deslauriers]

Change sort order to prefer items with known time remaining

    * Change sort order to prefer items with known time remaining
      (LP: #1315434)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:280
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/148/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Marc, thanks for the patch! LGTM.

I'm a little disappointed in myself that this didn't break any tests. I need to expand coverage to test this case :)

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2015-01-30 17:58:57 +0000
+++ src/service.c	2015-03-10 19:43:48 +0000
@@ -161,9 +161,9 @@
 
 /* sort devices from most interesting to least interesting on this criteria:
    1. discharging items from least time remaining until most time remaining
-   2. discharging items with an unknown time remaining
-   3. charging items from most time left to charge to least time left to charge
-   4. charging items with an unknown time remaining
+   2. charging items from most time left to charge to least time left to charge
+   3. charging items with an unknown time remaining
+   4. discharging items with an unknown time remaining
    5. batteries, then non-line power, then line-power */
 static gint
 device_compare_func (gconstpointer ga, gconstpointer gb)
@@ -182,7 +182,8 @@
   ret = 0;
 
   state = UP_DEVICE_STATE_DISCHARGING;
-  if (!ret && ((a_state == state) || (b_state == state)))
+  if (!ret && (((a_state == state) && a_time) ||
+               ((b_state == state) && b_time)))
     {
       if (a_state != state) /* b is discharging */
         {
@@ -204,8 +205,7 @@
     }
 
   state = UP_DEVICE_STATE_CHARGING;
-  if (!ret && (((a_state == state) && a_time) ||
-               ((b_state == state) && b_time)))
+  if (!ret && ((a_state == state) || (b_state == state)))
     {
       if (a_state != state) /* b is charging */
         {
@@ -226,6 +226,23 @@
         }
     }
 
+  state = UP_DEVICE_STATE_DISCHARGING;
+  if (!ret && ((a_state == state) || (b_state == state)))
+    {
+      if (a_state != state) /* b is discharging */
+        {
+          ret = 1;
+        }
+      else if (b_state != state) /* a is discharging */
+        {
+          ret = -1;
+        }
+      else /* both are discharging; use percentage */
+        {
+            ret = a_percentage < b_percentage ? -1 : 1;
+        }
+    }
+
   if (!ret) /* neither device is charging nor discharging... */
     {
       const int weight_a = get_device_kind_weight (a);