--- battstat_applet-2.0.13/src/acpi-linux.c Sun Nov 4 17:41:22 2001 +++ battstat_applet-2.0.13-bat1/src/acpi-linux.c Fri Aug 16 16:33:45 2002 @@ -106,11 +106,11 @@ low_capacity = 0; critical_capacity = 0; - if ((f = fopen("/proc/acpi/battery/1/info", "r"))) + if ((f = fopen("/proc/acpi/battery/BAT1/info", "r"))) { - max_capacity = al_get_field_int(f, "Design Capacity"); - low_capacity = al_get_field_int(f, "Design Capacity Warning"); - critical_capacity = al_get_field_int(f, "Design Capacity Low"); + max_capacity = al_get_field_int(f, "design capacity"); + low_capacity = al_get_field_int(f, "design capacity warning"); + critical_capacity = al_get_field_int(f, "design capacity low"); fclose(f); } @@ -121,27 +121,27 @@ charging = FALSE; remain = 0; - if ((f = fopen("/proc/acpi/battery/1/status", "r"))) + if ((f = fopen("/proc/acpi/battery/BAT1/state", "r"))) { gchar *s; gchar tmp[256]; - if ((s = al_get_field(f, "State", tmp, sizeof(tmp)))) + if ((s = al_get_field(f, "charging state", tmp, sizeof(tmp)))) charging = strcmp(s, "charging") == 0; - remain = al_get_field_int(f, "Remaining Capacity"); + remain = al_get_field_int(f, "remaining capacity"); fclose(f); } ac_online = FALSE; - if ((f = fopen("/proc/acpi/ac_adapter/0/status", "r"))) + if ((f = fopen("/proc/acpi/ac_adapter/ACAD/state", "r"))) { gchar *s; gchar tmp[256]; - if ((s = al_get_field(f, "Status", tmp, sizeof(tmp)))) + if ((s = al_get_field(f, "state", tmp, sizeof(tmp)))) ac_online = strcmp(s, "on-line") == 0; fclose(f);