[PATCH 10/11] wmbattery: Remove unnecessary brace.

2015-05-13 Thread Doug Torrance
Fixes "Invalid number of character ({) when these macros are defined" errors given by cppcheck. --- wmbattery/simplehal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmbattery/simplehal.c b/wmbattery/simplehal.c index 8647e4e..cf8531d 100644 --- a/wmbattery/simplehal.c +++

[PATCH 11/11] wmbattery: Bump to version 2.48.

2015-05-13 Thread Doug Torrance
--- wmbattery/ChangeLog| 30 ++ wmbattery/configure.ac | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/wmbattery/ChangeLog b/wmbattery/ChangeLog index 70214c1..5506dcb 100644 --- a/wmbattery/ChangeLog +++ b/wmbattery/ChangeLog @@ -1,3 +1,33 @

[PATCH 06/11] wmbattery: Improve help text for -i option.

2015-05-13 Thread Doug Torrance
--- wmbattery/wmbattery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmbattery/wmbattery.c b/wmbattery/wmbattery.c index c3a8ca5..042816c 100644 --- a/wmbattery/wmbattery.c +++ b/wmbattery/wmbattery.c @@ -385,7 +385,7 @@ char *parse_commandline(int argc, char *argv[])

[PATCH 08/11] wmbattery: Fix typos.

2015-05-13 Thread Doug Torrance
Ran `codespell -w`. --- wmbattery/ChangeLog | 4 ++-- wmbattery/wmbattery.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wmbattery/ChangeLog b/wmbattery/ChangeLog index 1876f4f..70214c1 100644 --- a/wmbattery/ChangeLog +++ b/wmbattery/ChangeLog @@ -456,7 +456,7 @@ wmbat

[PATCH 05/11] wmbattery: Expand -g option to allow positions relative to right or bottom.

2015-05-13 Thread Doug Torrance
Use '-' instead of '+', e.g., `wmbattery -g -0+0` will place wmbattery in the upper right hand corner of the screen. Thanks to Christoph Fritz for the feature request. --- wmbattery/wmbattery.1 | 2 +- wmbattery/wmbattery.c | 19 --- 2 files changed, 5 insertions(+), 16 deletions

[PATCH 07/11] wmbattery: Add -n option to disable dial graphic.

2015-05-13 Thread Doug Torrance
Thanks to Christoph Fritz for the feature request. --- wmbattery/mask_nodial.xbm | 46 ++ wmbattery/wmbattery.1 | 3 +++ wmbattery/wmbattery.c | 14 -- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 wmbattery/m

[PATCH 09/11] wmbattery: Properly free malloced memory.

2015-05-13 Thread Doug Torrance
Fixes memory leak found by cppcheck. --- wmbattery/acpi.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wmbattery/acpi.c b/wmbattery/acpi.c index 1e837d2..dc2f3bc 100644 --- a/wmbattery/acpi.c +++ b/wmbattery/acpi.c @@ -188,8 +188,10 @@ int find_items(char *itemname, ch

[PATCH 03/11] wmbattery: Makefile - use autoheader too

2015-05-13 Thread Doug Torrance
From: Christoph Fritz instead, configure complains about: config.status: error: cannot find input file: `config.h.in' --- wmbattery/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/wmbattery/Makefile b/wmbattery/Makefile index b46144f..a789c50 100644 --- a/wmbattery/Makefile +++ b

[PATCH 04/11] wmbattery: upower - don't exit after suspend/hibernation wakup

2015-05-13 Thread Doug Torrance
From: Christoph Fritz Immediately after suspend/hibernation wakup cycle, up_client_get_devices() can fail: libupower-glib-WARNING **: up_client_get_devices failed: Timeout was reached Since we do not interpret the UPower signals, just don't exit wmbattery after first up_client_get_devices() fa

[PATCH 02/11] wmbattery: Change manpage section from deprecated 1x to 1.

2015-05-13 Thread Doug Torrance
--- wmbattery/Makefile | 4 +- wmbattery/wmbattery.1 | 120 + wmbattery/wmbattery.1x | 120 - 3 files changed, 122 insertions(+), 122 deletions(-) create mode 100644 wmbattery/wmbattery.1 delet

[PATCH 01/11] wmbattery: Escape hyphen in manpage.

2015-05-13 Thread Doug Torrance
Fixes hyphen-used-as-minus-sign Lintian warning in the Debian package. Patch from [1]. [1] https://sources.debian.net/src/wmbattery/2.47-1/debian/patches/escape_manpage_hyphens.patch/ --- wmbattery/wmbattery.1x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmbattery/wmbatt

[PATCH 00/11] wmbattery updates

2015-05-13 Thread Doug Torrance
Hi everyone, These patches introduce a new verison of wmbattery. Carlos, could you tag the last patch wmbattery-2.48? Thanks! Doug Christoph Fritz (2): wmbattery: Makefile - use autoheader too wmbattery: upower - don't exit after suspend/hibernation wakup Doug Torrance (9): wmbattery: E