Show the apropiate icon depending of the status of the devices

Follow https://wiki.ubuntu.com/BatteryStatusMenu :

- If anything is discharging, the menu title should represent the thing 
  that is estimated to lose power first.
- If no devices are discharging, the menu title should represent the device
  that is estimated to take longest to charge.

1 files changed, 40 insertions, 2 deletions

diff --git a/src/indicator-power.c b/src/indicator-power.c
index bbc653b..9280bdb 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -443,11 +443,18 @@ get_primary_device (GVariant *devices)
 {
   UpDeviceKind kind;
   UpDeviceState state;
+  GVariant *device;
+  GVariant *primary_device_charging = NULL;
+  GVariant *primary_device_discharging = NULL;
   GVariant *primary_device = NULL;
+  gboolean charging = FALSE;
+  gboolean discharging = FALSE;
   gchar *object_path;
   gchar *device_icon;
   gdouble percentage;
   guint64 time;
+  guint64 min_discharging_time = G_MAXUINT64;
+  guint64 max_charging_time = 0;
   gsize n_devices;
   guint i;
 
@@ -456,8 +463,8 @@ get_primary_device (GVariant *devices)
 
   for (i = 0; i < n_devices; i++)
     {
-      primary_device = g_variant_get_child_value (devices, i);
-      g_variant_get (primary_device,
+      device = g_variant_get_child_value (devices, i);
+      g_variant_get (device,
                      "(susdut)",
                      &object_path,
                      &kind,
@@ -467,6 +474,37 @@ get_primary_device (GVariant *devices)
                      &time);
 
       g_debug ("%s: got data from object %s", G_STRFUNC, object_path);
+
+      if (primary_device == NULL && kind == UP_DEVICE_KIND_BATTERY)
+        primary_device = device;
+
+      if (state == UP_DEVICE_STATE_DISCHARGING)
+        {
+          discharging = TRUE;
+          if (time < min_discharging_time)
+            {
+              min_discharging_time = time;
+              primary_device_discharging = device;
+            }
+        }
+      else if (state == UP_DEVICE_STATE_CHARGING)
+        {
+          charging = TRUE;
+          if (time > max_charging_time)
+            {
+              max_charging_time = time;
+              primary_device_charging = device;
+            }
+        }
+    }
+
+  if (discharging)
+    {
+      primary_device = primary_device_discharging;
+    }
+  else if (charging)
+    {
+      primary_device = primary_device_charging;
     }
 
   return primary_device;