diff -ruN kdeutils-3.0.3/klaptopdaemon/portable.cpp kdeutils-3.0.3.jikos/klaptopdaemon/portable.cpp --- kdeutils-3.0.3/klaptopdaemon/portable.cpp 2002-01-26 18:58:32.000000000 +0100 +++ kdeutils-3.0.3.jikos/klaptopdaemon/portable.cpp 2003-03-01 16:26:27.000000000 +0100 @@ -98,17 +98,17 @@ } static const char * const batt_info[] = { - "/proc/acpi/battery/0/info", - "/proc/acpi/battery/1/info", - "/proc/acpi/battery/2/info", - "/proc/acpi/battery/3/info", + "/proc/acpi/battery/BAT0/info", + "/proc/acpi/battery/BAT1/info", + "/proc/acpi/battery/BAT2/info", + "/proc/acpi/battery/BAT3/info", }; static const char * const batt_status[] = { - "/proc/acpi/battery/0/status", - "/proc/acpi/battery/1/status", - "/proc/acpi/battery/2/status", - "/proc/acpi/battery/3/status", + "/proc/acpi/battery/BAT0/state", + "/proc/acpi/battery/BAT1/state", + "/proc/acpi/battery/BAT2/state", + "/proc/acpi/battery/BAT3/state", }; @@ -188,18 +188,18 @@ for (;;) { if (fgets(buff, sizeof(buff), f) == NULL) break; - if (strstr(buff, "Design Capacity Low:") != NULL) { + if (strstr(buff, "design capacity low:") != NULL) { caplow = getint(buff); } else - if (strstr(buff, "Present Rate:") != NULL) { + if (strstr(buff, "present rate:") != NULL) { v = getint(buff); if (v < 0) v = 0; } else - if (strstr(buff, "Last Full Capacity:") != NULL) { + if (strstr(buff, "last full capacity:") != NULL) { cap = getint(buff); } else - if (strstr(buff, "Remaining Capacity:") != NULL) { + if (strstr(buff, "remaining capacity:") != NULL) { remaining = getint(buff); } } @@ -233,12 +233,12 @@ ap->battery_time = -1; ap->ac_line_status = 0; ap->apm_flags = 0; - f = fopen("/proc/acpi/ac_adapter/0/status", "r"); + f = fopen("/proc/acpi/ac_adapter/AC/state", "r"); if (f) { for (;;) { if (fgets(buff, sizeof(buff), f) == NULL) break; - if (strstr(buff, "Status:") != NULL) { + if (strstr(buff, "state:") != NULL) { if (strstr(buff, "on-line") != NULL) ap->ac_line_status |= 1; break; @@ -281,7 +281,7 @@ return(val); init = 1; val = 0; - if (::access("/proc/acpi/ac_adapter/0/status", R_OK) == 0) + if (::access("/proc/acpi/ac_adapter/AC/state", R_OK) == 0) acpi_ac_ok = 1; for (i = 0; i < 4; i++) { if (::access(batt_status[i], R_OK) == 0 ||