hal/hald/linux2 acpi.c,1.32,1.33 pmu.c,1.13,1.14

[Danny Kukawka]

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

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

        * hald/linux2/acpi.c, hald/linux2/addons/addon-acpi.c
        hald/linux2/addons/addon-pmu.c, hald/linux2/addons/addon-storage.c,
        hald/linux2/pmu.c: (battery_refresh): Fixed several compiler warnings
        and removed unused variables.



Index: acpi.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/acpi.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- acpi.c	11 Aug 2005 18:54:39 -0000	1.32
+++ acpi.c	11 Aug 2005 21:19:57 -0000	1.33
@@ -79,7 +79,6 @@
 	int mwh_lastfull;
 	int mwh_rate;
 	int voltage_current;
-	int voltage_design;
 	int remaining_time;
 	int remaining_percentage;
 
@@ -179,7 +178,7 @@
 	;
 }
 
-static void
+static gboolean
 battery_poll_infrequently (gpointer data) {
 	
 	GSList *i;
@@ -206,6 +205,7 @@
 	}
 
 	g_slist_free (battery_devices);
+	return TRUE;
 }
 
 
@@ -666,7 +666,7 @@
 		       acpi_poll,
 		       NULL);
 	/* setup timer for things that we need only to poll infrequently*/
-	g_timeout_add (ACPI_POLL_INTERVAL*120,
+	g_timeout_add ((ACPI_POLL_INTERVAL*120),
 		       battery_poll_infrequently,
 		       NULL);
 

Index: pmu.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/pmu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pmu.c	29 Jul 2005 20:32:57 -0000	1.13
+++ pmu.c	11 Aug 2005 21:19:57 -0000	1.14
@@ -68,7 +68,7 @@
 {
 	const char *path;
 	int flags;
-	int current, last_full;
+	int last_full;
 
 	path = hal_device_property_get_string (d, "linux.pmu_path");
 	if (path == NULL)