The acpid event handling that recently got into battstat seems to be broken
for me. 

It looks like sometimes the read ins acpi_process event is getting half and
event, or something.  At any rate, acpi status changes aren't updated by
battstat.

I'm using gnome-2.4.1 from fedora-core 1 with kernel 2.6-test11 with a few
custom patches, mainly for acpi.

I've written a patch that cleans this up a bit, and makes things more
readable, and best of all, fixes the problem. 

Take a look at bug 88553 for more info.

I diffed my changes with the latest cvs and went through by hand and mined
out all of the cruft, so apologies if it's somehow mangled.


diff -ur battstat/acpi-linux.c
/tmp/rpm/BUILD/gnome-applets-2.4.1/battstat/acpi-linux.c
--- battstat/acpi-linux.c	2003-10-22 18:01:18.000000000 -0400
+++ /tmp/rpm/BUILD/gnome-applets-2.4.1/battstat/acpi-linux.c	2003-12-11
21:33:52.847038352 -0500
@@ -294,31 +294,12 @@
 /* Given a string event from the ACPI system, returns the type
  * of event if we're interested in it.  str is updated to point
  * to the next event. */
-static int parse_acpi_event(char * event, char ** str)
+static int parse_acpi_event(GString *buffer)
 {
-  char * end;
-  char * tok[4];
-  int i;
-
-  end = strchr(event, '\n');
-  if (!end)
-    return ACPI_EVENT_DONE;
-
-  *end = '\0';
-  *str = end + 1;
-
-  tok[0] = event;
-  for (i=0; i < 3; i++) {
-    tok[i+1] = strchr(tok[i], ' ');
-    if (!tok[i+1])
-      return ACPI_EVENT_IGNORE;
-    *(tok[i+1]) = '\0';
-    tok[i+1]++;
-  }
   
-  if (!strcmp(tok[0], "ac_adapter"))
+  if (strstr(buffer->str, "ac_adapter"))
     return ACPI_EVENT_AC;
-  if (!strcmp(tok[0], "battery") && atoi(tok[2]) == 81)
+  if (strstr(buffer->str, "battery") )
     return ACPI_EVENT_BATTERY_INFO;
 
   return ACPI_EVENT_IGNORE;
@@ -330,16 +311,18 @@
  * by select(). */
 gboolean acpi_process_event(struct acpi_info * acpiinfo)
 {
-    int i;
+    gsize i;
     int evt;
     char * s;
-    char str[256];
+    /*    char str[1024];*/
     gboolean result = FALSE;
+    GString *buffer;
+    GError *gerror=NULL;
+    buffer=g_string_new(NULL);
+    g_io_channel_read_line_string   ( acpiinfo->channel,buffer,&i,&gerror);
 
-    i = read(acpiinfo->event_fd, str, sizeof(str)-1);
-    str[i] = '\0';
-    s = str;
-    while ((evt = parse_acpi_event(s, &s)) != ACPI_EVENT_DONE) {
+    
+    evt = parse_acpi_event(buffer);
       switch (evt) {
         case ACPI_EVENT_AC:
           update_ac_info(acpiinfo);
@@ -350,7 +333,7 @@
           result = TRUE;
           break;
       }
-    }
+    
 
     return result;
 }