hal/hald/linux2 apm.c,1.13,1.14

[Danny Kukawka]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv16617/hald/linux2

Modified Files:
	apm.c 
Log Message:
2005-11-08  Danny Kukawka  <danny.kukawka at web.de>

        * hald/linux2/apm.c: (battery_refresh): fixed fd.o-Bug #4871 with slightly
        adopted patch from Shun-ichi Tahara <jado at flowernet.gr.jp>



Index: apm.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/apm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- apm.c	25 Oct 2005 16:06:13 -0000	1.13
+++ apm.c	8 Nov 2005 11:48:17 -0000	1.14
@@ -61,7 +61,6 @@
 	int battery_flags;
 	int battery_percentage;
 	int battery_time;
-	int using_minutes;
 } APMInfo;
 
 #define APM_POLL_INTERVAL 2000
@@ -200,7 +199,7 @@
 			is_charging = FALSE;
 			is_discharging = (i.ac_line_status == FALSE);
 			/* apm returns time in minutes, not seconds */
-			remaining_time = i.using_minutes * 60;
+			remaining_time = i.battery_time * 60;
 			if (remaining_time < 0)
 				remaining_time = 0; 
 		}