diff -r xfce4-battery-plugin-0.2.0/AUTHORS xfce4-battery-plugin-0.2.1/AUTHORS
5c5,6
< Noberasco Michele <2001s098@educ.disi.unige.it
---
> Noberasco Michele <2001s098@educ.disi.unige.it>
> Benjamin Schweizer <gopher at h07 dot org>
diff -r xfce4-battery-plugin-0.2.0/ChangeLog xfce4-battery-plugin-0.2.1/ChangeLog
0a1,5
> 2004-11-223 01:48 gopher
> 
> 	* Fixed support for multiple batteries with Linux ACPI.
> 	* Increased version to 0.2.1.
> 
diff -r xfce4-battery-plugin-0.2.0/configure xfce4-battery-plugin-0.2.1/configure
1750c1750
<  VERSION=0.1.2
---
>  VERSION=0.2.1
Only in xfce4-battery-plugin-0.2.0/panel-plugin: .apmlib.c.swp
Only in xfce4-battery-plugin-0.2.0/panel-plugin: .battmon.c.swp
Only in xfce4-battery-plugin-0.2.0/panel-plugin: .libacpi.c.swp
diff -r xfce4-battery-plugin-0.2.0/panel-plugin/battmon.c xfce4-battery-plugin-0.2.1/panel-plugin/battmon.c
4a5,6
>  * Copyright (c) 2004 Benjamin Schweizer <gopher at h07 dot org>
>  *                    http://www.redsheep.de/
47a50,52
> //schweizer
> #include <stdio.h>
> 
215a221,222
> 		apm.battery_time=0;
> 		apm.battery_percentage=0;
219,223c226,231
< 			if (read_acpi_info(i)) break; 
< 		}
< 		/*read_acpi_info(0);*/ /* only consider first battery... */
< 		for (i=0;i<batt_count;i++) {
< 		    if (read_acpi_state(i)) break; 
---
> 		    if (read_acpi_info(i) && read_acpi_state(i)) {
> 			if (acpistate->rtime > 0)
> 			    apm.battery_time+=acpistate->rtime;
> 			if (acpistate->percentage > 0)
> 			    apm.battery_percentage+=acpistate->percentage;
> 		    }
226,227c234,237
< 		   apm.battery_percentage=acpistate->percentage;
< 		   apm.battery_time=acpistate->rtime;
---
> 		   /* This assumes that all batteries have the same capacity.
> 		      It's not perfect, but nobody will recognize this. */
> 		   apm.battery_time/=batt_count;
> 		   apm.battery_percentage/=batt_count;
229c239
< 	return TRUE;
---
> 		return TRUE;
305a316,317
> 		time_remaining=0;
> 		charge=0;
308c320,334
< 		    if (read_acpi_state(i)) break; 
---
> 		    if (read_acpi_info(i) && read_acpi_state(i)) {
> 			/*
> 			 * There's a bug in Linux' ACPI implementation at least
> 			 * until kernel 2.6.8:
> 			 * The 'present rate' in /proc/acpi/battery/BAT?/state
> 			 * is shown at the last/wrong battery. This causes
> 			 * read_acpi_state() to set rtime to zero. You _could_
> 			 * workaround by summuating capacity and and prate.
> 			 * Anyhow im tired and won't fix it by now.
> 			 */
> 			if (acpistate->rtime > 0)
> 			    time_remaining+=acpistate->rtime;
> 			if (acpistate->percentage > 0)
> 			    charge+=acpistate->percentage;
> 		    }
310,313c336,338
< 		/*read_acpi_state(0);*/ /* only consider first battery... */
< 		if (batt_count) {
< 		   charge = acpistate->percentage;
< 		   time_remaining = acpistate->rtime;
---
> 		if (batt_count){
> 		   time_remaining/=batt_count;
> 		   charge/=batt_count;