aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-07-22 11:59:59 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-07-22 11:59:59 -0500
commit79a3d892c39ba831e44871ca99a064084bd792e9 (patch)
tree042d3b40383bca76c454ce85de48bc4998d0d53f
parent584aa80f415597a2970bfd29fa0d48b9a8842086 (diff)
downloadayatana-indicator-power-79a3d892c39ba831e44871ca99a064084bd792e9.tar.gz
ayatana-indicator-power-79a3d892c39ba831e44871ca99a064084bd792e9.tar.bz2
ayatana-indicator-power-79a3d892c39ba831e44871ca99a064084bd792e9.zip
Filter out some redundant warnings -- e.g., don't notify when the power percentage drops from 10% to 9%, only when it crosses a PowerLevel threshold
-rw-r--r--src/notifier.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/notifier.c b/src/notifier.c
index 2d2730e..326f5a1 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -61,6 +61,7 @@ struct _IndicatorPowerNotifierPrivate
See indicator_power_service_choose_primary_device() */
IndicatorPowerDevice * battery;
PowerLevel power_level;
+ gboolean discharging;
NotifyNotification* notify_notification;
gboolean is_warning;
@@ -150,17 +151,25 @@ static void
on_battery_property_changed (IndicatorPowerNotifier * self)
{
priv_t * p;
+ PowerLevel old_power_level;
+ PowerLevel new_power_level;
+ gboolean old_discharging;
+ gboolean new_discharging;
g_return_if_fail(INDICATOR_IS_POWER_NOTIFIER(self));
g_return_if_fail(INDICATOR_IS_POWER_DEVICE(self->priv->battery));
p = self->priv;
- set_power_level_property (self,
- indicator_power_notifier_get_power_level (p->battery));
+ old_power_level = p->power_level;
+ new_power_level = indicator_power_notifier_get_power_level (p->battery);
- if ((indicator_power_device_get_state(p->battery) == UP_DEVICE_STATE_DISCHARGING) &&
- (p->power_level != POWER_LEVEL_OK))
+ old_discharging = p->discharging;
+ new_discharging = indicator_power_device_get_state(p->battery) == UP_DEVICE_STATE_DISCHARGING;
+
+ if (new_discharging &&
+ (new_power_level != POWER_LEVEL_OK) &&
+ ((new_power_level != old_power_level) || (new_discharging != old_discharging)))
{
notification_show (self);
}
@@ -168,6 +177,9 @@ on_battery_property_changed (IndicatorPowerNotifier * self)
{
notification_clear (self);
}
+
+ set_power_level_property (self, new_power_level);
+ p->discharging = new_discharging;
}
/***