hal/hald/linux2 apm.c,1.7,1.8

[David Zeuthen]

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

Modified Files:
	apm.c 
Log Message:
2005-03-17  David Zeuthen  <davidz at redhat.com>

	* hald/util.c (hal_util_grep_file): Remove some debug spewage

2005-03-17  Richard hughes  <richard at hughsie.com>

	* hald/linux2/apm.c (battery_refresh):
	Fix a typo, s/battery.charge_level/battery.charge_level.current
	so that matches ACPI (and HAL spec).

	* hald/linux2/addons/addon-hid-ups.c:
	Fix a typo, s/battery.is_charging/battery.rechargeable.is_charging
	so that matches ACPI (and HAL spec).

2005-03-17  David Zeuthen  <davidz at redhat.com>

	* tools/linux/hal_hotplug.c: We need to look for the
	sysfs_mount_path only if we read the ifindex from a network
	interface. This safes us from parsing the proc file with every
	hotplug event. From Kay Sievers <kay.sievers at vrfy.org>.



Index: apm.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/apm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- apm.c	16 Mar 2005 20:09:47 -0000	1.7
+++ apm.c	17 Mar 2005 17:19:43 -0000	1.8
@@ -134,7 +134,7 @@
 		device_property_atomic_update_begin ();
 		hal_device_property_set_bool (d, "battery.is_rechargeable", TRUE);
 		hal_device_property_set_bool (d, "battery.present", TRUE);
-		hal_device_property_set_int (d, "battery.charge_level", i.battery_percentage);
+		hal_device_property_set_int (d, "battery.charge_level.current", i.battery_percentage);
 		hal_device_property_set_string (d, "battery.charge_level.unit", "percent");
 
 		hal_device_property_set_int (d, "battery.charge_level.design", 100);