handle other states for "state" - not charging is an... interesting one...

(as a replacement for discharging)

SVN revision: 35401

diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index 45b7dcc..e6931a9 100644 (file)
--- a/src/modules/battery/batget.c
+++ b/src/modules/battery/batget.c
@@ -712,6 +712,8 @@ linux_sys_class_power_supply_check(void)
               {
                  full = 0;
                  if (!strncasecmp("discharging", tmp, 11)) charging = 0;
+                 else if (!strncasecmp("unknown", tmp, 7)) charging = 0;
+                 else if (!strncasecmp("not charging", tmp, 12)) charging = 0;
                  else if (!strncasecmp("charging", tmp, 8)) charging = 1;
                  else if (!strncasecmp("full", tmp, 4))
                    {
@@ -1058,7 +1060,7 @@ linux_acpi_check(void)
                  tmp = str_get(buf);
                  if (tmp)
                    {
-                      if (!strcmp(tmp, "yes")) have_battery = 1;
+                      if (!strcasecmp(tmp, "yes")) have_battery = 1;
                       free(tmp);
                    }
                  /* capacity state: ok/? */
@@ -1070,7 +1072,7 @@ linux_acpi_check(void)
                    {
                       if (have_power == 0)
                         {
-                           if (!strcmp(tmp, "charging")) have_power = 1;
+                           if (!strcasecmp(tmp, "charging")) have_power = 1;
                         }
                       free(tmp);
                    }
@@ -1079,7 +1081,7 @@ linux_acpi_check(void)
                   tmp = str_get(buf);
                   if (tmp)
                    {
-                      if (strcmp(tmp, "unknown")) rate += atoi(tmp);
+                      if (strcasecmp(tmp, "unknown")) rate += atoi(tmp);
                       free(tmp);
                    }
                  /* remaining capacity: NNN */
@@ -1087,7 +1089,7 @@ linux_acpi_check(void)
                   tmp = str_get(buf);
                   if (tmp)
                    {
-                      if (strcmp(tmp, "unknown")) capacity += atoi(tmp);
+                      if (strcasecmp(tmp, "unknown")) capacity += atoi(tmp);
                       free(tmp);
                    }
                  fclose(f);