aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-09-08 16:19:37 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-09-08 16:19:37 -0500
commitee6e07ff8b0765a584b8424dc4801833ac86317e (patch)
tree1e529bd001164cd4c47989b11e0dd8faf89ac028 /src
parent24b9a28725106d1762fcefb0652f2cb06ad9aa4c (diff)
downloadayatana-indicator-power-ee6e07ff8b0765a584b8424dc4801833ac86317e.tar.gz
ayatana-indicator-power-ee6e07ff8b0765a584b8424dc4801833ac86317e.tar.bz2
ayatana-indicator-power-ee6e07ff8b0765a584b8424dc4801833ac86317e.zip
sync with lp-1330037-add-upower-099-support to resolve merge conflicts
Diffstat (limited to 'src')
-rw-r--r--src/notifier.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/notifier.c b/src/notifier.c
index f4c8950..1767146 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -103,7 +103,7 @@ power_level_to_dbus_string (const PowerLevel power_level)
}
}
-PowerLevel
+static PowerLevel
get_battery_power_level (IndicatorPowerDevice * battery)
{
static const double percent_critical = 2.0;
@@ -366,9 +366,6 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
if (!instance_count++)
{
- GList * caps;
- GList * l;
-
actions_supported = FALSE;
if (!notify_init("indicator-power-service"))
@@ -377,6 +374,9 @@ indicator_power_notifier_init (IndicatorPowerNotifier * self)
}
else
{
+ GList * caps;
+ GList * l;
+
/* see if actions are supported */
caps = notify_get_server_caps();
for (l=caps; l!=NULL && !actions_supported; l=l->next)