aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/device.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/device.c b/src/device.c
index 05eb15e..91d7cf1 100644
--- a/src/device.c
+++ b/src/device.c
@@ -773,6 +773,15 @@ get_menuitem_text (const IndicatorPowerDevice * device,
time_str = get_expanded_time_remaining (device);
}
+ if (p->percentage > 0.01 && time_str != NULL)
+ {
+ if (g_str_equal(time_str, _("estimating…")) || g_str_equal(time_str, _("unknown")))
+ {
+ g_free(time_str);
+ time_str = NULL;
+ }
+ }
+
if (time_str && *time_str)
{
/* TRANSLATORS: example: "battery (time remaining)" */
@@ -780,7 +789,14 @@ get_menuitem_text (const IndicatorPowerDevice * device,
}
else
{
- str = g_strdup (kind_str);
+ if (p->percentage > 0.01)
+ {
+ str = g_strdup_printf("%s (%.0lf%%)", kind_str, p->percentage);
+ }
+ else
+ {
+ str = g_strdup (kind_str);
+ }
}
g_free (time_str);