From 181b3660397548ea8fabb00d3938e30cefa79d55 Mon Sep 17 00:00:00 2001
From: Phillip Susi <Unknown>
Date: Mon, 14 Jan 2013 10:21:01 -0600
Subject: merge lp:~psusi/ubuntu/raring/indicator-power/show-ups

---
 src/indicator-power.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/indicator-power.c')

diff --git a/src/indicator-power.c b/src/indicator-power.c
index 06f1c2e..729c7cf 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -615,7 +615,8 @@ count_batteries (GSList * devices, int *total, int *inuse)
     {
       const IndicatorPowerDevice * device = INDICATOR_POWER_DEVICE(l->data);
 
-      if (indicator_power_device_get_kind(device) == UP_DEVICE_KIND_BATTERY)
+      if (indicator_power_device_get_kind(device) == UP_DEVICE_KIND_BATTERY ||
+	  indicator_power_device_get_kind(device) == UP_DEVICE_KIND_UPS)
         {
           ++*total;
 
-- 
cgit v1.2.3