hal/hald/linux2/addons addon-hid-ups.c,1.2,1.3

[David Zeuthen]

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

Modified Files:
	addon-hid-ups.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: addon-hid-ups.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/addons/addon-hid-ups.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- addon-hid-ups.c	2 Mar 2005 21:51:55 -0000	1.2
+++ addon-hid-ups.c	17 Mar 2005 17:19:43 -0000	1.3
@@ -162,12 +162,12 @@
 
 					case 0x850044: /* Charging */
 						libhal_device_set_property_bool (
-							ctx, udi, "battery.is_charging", uref.value != 0, &error);
+							ctx, udi, "battery.rechargeable.is_charging", uref.value != 0, &error);
 						break;
 
 					case 0x850045: /* Discharging */
 						libhal_device_set_property_bool (
-							ctx, udi, "battery.is_discharging", uref.value != 0, &error);
+							ctx, udi, "battery.rechargeable.is_discharging", uref.value != 0, &error);
 						break;
 
 					case 0x8500d1: /* BatteryPresent */
@@ -304,12 +304,12 @@
 					
 				case 0x850044: /* Charging */
 					libhal_device_set_property_bool (
-						ctx, udi, "battery.is_charging", ev[i].value != 0, &error);
+						ctx, udi, "battery.rechargeable.is_charging", ev[i].value != 0, &error);
 					break;
 					
 				case 0x850045: /* Discharging */
 					libhal_device_set_property_bool (
-						ctx, udi, "battery.is_discharging", ev[i].value != 0, &error);
+						ctx, udi, "battery.rechargeable.is_discharging", ev[i].value != 0, &error);
 					break;
 					
 				default: