slstatus

commit 74891945d897530b30c2c29844808d63bff625b7
parent 06d4447f03669b72a885a997b666e4cbcc6b5ed1
Author: Aaron Marcher <me@drkhsh.at>
Date:   Sat, 19 May 2018 13:25:35 +0200

Revert aac29e2 as it is nonsense

Diffstat:
M
components/battery.c
 | 
22
++++++++++++++--------

1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/components/battery.c b/components/battery.c
@@ -5,14 +5,6 @@
 
 #include "../util.h"
 
-static struct {
-	char *state;
-	char *symbol;
-} map[] = {
-	{ "Charging",    "+" },
-	{ "Discharging", "-" },
-};
-
 #if defined(__linux__)
 	#include <limits.h>
 
@@ -30,6 +22,13 @@ static struct {
 	const char *
 	battery_state(const char *bat)
 	{
+		static struct {
+			char *state;
+			char *symbol;
+		} map[] = {
+			{ "Charging",    "+" },
+			{ "Discharging", "-" },
+		};
 		size_t i;
 		char path[PATH_MAX], state[12];
 
@@ -122,6 +121,13 @@ static struct {
 	const char *
 	battery_state(const char *unused)
 	{
+		struct {
+			unsigned int state;
+			char *symbol;
+		} map[] = {
+			{ APM_AC_ON,      "+" },
+			{ APM_AC_OFF,     "-" },
+		};
 		struct apm_power_info apm_info;
 		size_t i;