aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhillip Susi <Unknown>2013-01-14 10:21:01 -0600
committerCharles Kerr <charles.kerr@canonical.com>2013-01-14 10:21:01 -0600
commit181b3660397548ea8fabb00d3938e30cefa79d55 (patch)
treeda1de98c2c2c1dacbeea6f662ee72337ee036ff8 /src
parent7281308e2a2dc2e580065d5ce501752ba4da3d01 (diff)
downloadayatana-indicator-power-181b3660397548ea8fabb00d3938e30cefa79d55.tar.gz
ayatana-indicator-power-181b3660397548ea8fabb00d3938e30cefa79d55.tar.bz2
ayatana-indicator-power-181b3660397548ea8fabb00d3938e30cefa79d55.zip
merge lp:~psusi/ubuntu/raring/indicator-power/show-ups
Diffstat (limited to 'src')
-rw-r--r--src/indicator-power.c3
1 files changed, 2 insertions, 1 deletions
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;