diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2014-08-22 16:15:36 +0000 |
---|---|---|
committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-08-22 16:15:36 +0000 |
commit | 575a5a16fa514310d029cb3cb894f95a0836ef95 (patch) | |
tree | d8276c3e82e89fe48b08f11093feb651e45c2236 /src/device.c | |
parent | c7e1740203b41bb9cb12da0ea97477363224e3ee (diff) | |
parent | 9eee0b56872fdb9fcf5301525985821ea7bfb2af (diff) | |
download | ayatana-indicator-power-575a5a16fa514310d029cb3cb894f95a0836ef95.tar.gz ayatana-indicator-power-575a5a16fa514310d029cb3cb894f95a0836ef95.tar.bz2 ayatana-indicator-power-575a5a16fa514310d029cb3cb894f95a0836ef95.zip |
Choose the icon that's closest to the current battery charge percentage Fixes: 1186181
Approved by: Antti Kaijanmäki, PS Jenkins bot
Diffstat (limited to 'src/device.c')
-rw-r--r-- | src/device.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/device.c b/src/device.c index f37aa7d..eff76d1 100644 --- a/src/device.c +++ b/src/device.c @@ -353,13 +353,6 @@ device_kind_to_string (UpDeviceKind kind) indicator_power_device_get_icon_names: @device: #IndicatorPowerDevice from which to generate the icon names - This function's logic differs from GSD's power plugin in some ways: - - 1. For discharging batteries, we decide whether or not to use the 'caution' - icon based on whether or not we have <= 30 minutes remaining, rather than - looking at the battery's percentage left. - <https://bugs.launchpad.net/indicator-power/+bug/743823> - See also indicator_power_device_get_gicon(). Return value: (array zero-terminated=1) (transfer full): @@ -423,13 +416,6 @@ indicator_power_device_get_icon_names (const IndicatorPowerDevice * device) case UP_DEVICE_STATE_PENDING_CHARGE: case UP_DEVICE_STATE_DISCHARGING: case UP_DEVICE_STATE_PENDING_DISCHARGE: - /* Don't show the caution/red icons unless we have <=30 min left. - <https://bugs.launchpad.net/indicator-power/+bug/743823> - Themes use the caution color when the percentage is 0% or 20%, - so if we have >30 min left, use 30% as the icon's percentage floor */ - if (indicator_power_device_get_time (device) > (30*60)) - percentage = MAX(percentage, 30); - suffix_str = get_device_icon_suffix (percentage); index_str = get_device_icon_index (percentage); g_ptr_array_add (names, g_strdup_printf ("%s-%s", kind_str, index_str)); |