diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2007-09-11 14:53:15 -0300 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:43 -0500 |
| commit | 99a9c2a16af89bceed1f90c58faefd555a3268c3 (patch) | |
| tree | 1e92d5f8160b4445b2459044400120e430f1fc23 /arch/linux/common/battery.h | |
| parent | 0afab9fd83ec42e082ffa61f037519f3e1262e39 (diff) | |
| parent | 7aeb5ac87c6105bd8fcc9b1fd12e37ba1550f587 (diff) | |
Import Debian changes 0.4.2.2-1
hardinfo (0.4.2.2-1) unstable; urgency=low
* New upstream release.
* hardinfo now suggests mesa-utils (Closes: #435793)
Diffstat (limited to 'arch/linux/common/battery.h')
| -rw-r--r-- | arch/linux/common/battery.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/linux/common/battery.h b/arch/linux/common/battery.h index 20979e48..4a38b842 100644 --- a/arch/linux/common/battery.h +++ b/arch/linux/common/battery.h @@ -92,7 +92,7 @@ __scan_battery_acpi(void) if (g_str_equal(present, "yes")) { charge_rate = atof(remaining) / atof(capacity); - battery_list = g_strdup_printf("%s\n[Battery: %s]\n" + battery_list = h_strdup_cprintf("\n[Battery: %s]\n" "State=%s (load: %s)\n" "Capacity=%s / %s (%.2f%%)\n" "Battery Technology=%s (%s)\n" @@ -174,7 +174,7 @@ __scan_battery_apm(void) } if (stotal && sremaining) { - battery_list = g_strdup_printf("%s\n[Battery (APM)]\n" + battery_list = h_strdup_cprintf("\n[Battery (APM)]\n" "Charge=%d%%\n" "Remaining Charge=%s of %s\n" "Using=%s\n" @@ -186,7 +186,7 @@ __scan_battery_apm(void) ac_status[ac_bat], apm_drv_ver, apm_bios_ver); } else { - battery_list = g_strdup_printf("%s\n[Battery (APM)]\n" + battery_list = h_strdup_cprintf("\n[Battery (APM)]\n" "Charge=%d%%\n" "Using=%s\n" "APM driver version=%s\n" @@ -209,4 +209,11 @@ __scan_battery(void) __scan_battery_acpi(); __scan_battery_apm(); + + if (*battery_list == '\0') { + g_free(battery_list); + + battery_list = g_strdup("[No batteries]\n" + "No batteries found on this system=\n"); + } } |