diff options
| author | Ted Gould <ted@gould.cx> | 2013-10-29 09:25:02 -0700 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2013-10-29 09:25:02 -0700 |
| commit | fb134415e1e0042a00db4008e91adccd7d8eeff2 (patch) | |
| tree | 7167a1e3e4fe537daf4f0062a25875806237189e /src/device.c | |
| parent | 812ac9a18c469c7a4ad60cd7bb1921eb622d7df9 (diff) | |
| parent | 1a9e81a4071d1bd137ca8135a993ad65a91e8ee9 (diff) | |
| download | ayatana-indicator-power-fb134415e1e0042a00db4008e91adccd7d8eeff2.tar.gz ayatana-indicator-power-fb134415e1e0042a00db4008e91adccd7d8eeff2.tar.bz2 ayatana-indicator-power-fb134415e1e0042a00db4008e91adccd7d8eeff2.zip | |
Updating to trunk
Diffstat (limited to 'src/device.c')
| -rw-r--r-- | src/device.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/device.c b/src/device.c index 9dc4647..508a734 100644 --- a/src/device.c +++ b/src/device.c @@ -328,10 +328,7 @@ device_kind_to_string (UpDeviceKind kind) This function's logic differs from GSD's power plugin in some ways: - 1. All charging batteries use the same icon regardless of progress. - <https://bugs.launchpad.net/indicator-power/+bug/824629/comments/7> - - 2. For discharging batteries, we decide whether or not to use the 'caution' + 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> @@ -389,10 +386,6 @@ indicator_power_device_get_icon_names (const IndicatorPowerDevice * device) case UP_DEVICE_STATE_CHARGING: case UP_DEVICE_STATE_PENDING_CHARGE: - /* When charging, always use the same icon regardless of percentage. - <http://bugs.launchpad.net/indicator-power/+bug/824629> */ - percentage = 0; - suffix_str = get_device_icon_suffix (percentage); index_str = get_device_icon_index (percentage); g_ptr_array_add (names, g_strdup_printf ("%s-%s-charging-symbolic", kind_str, suffix_str)); |