hal: Branch 'master'

[Richard Hughes]

 hald/linux/device.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree f42df3da3119e9cbf6ddf3764fd56ae701c0da1a (from 6e6be2581895b3751e069f3fec69eb3bfa74cba4)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 10 10:54:50 2007 +0100

    correct two typos to the power_supply code
    
    Correct two typos, one was not using rechargeable prefix, and one for setting charging with the discharging value. Oops. Found by marco, many thanks.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index e64b108..74d1483 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -2999,8 +2999,8 @@ refresh_battery_fast (HalDevice *d)
 		} else if (strcasecmp (status, "discharging") == 0) {
 			is_discharging = TRUE;
 		}
-		hal_device_property_set_bool (d, "battery.is_charging", is_charging);
-		hal_device_property_set_bool (d, "battery.is_charging", is_discharging);
+		hal_device_property_set_bool (d, "battery.rechargeable.is_charging", is_charging);
+		hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", is_discharging);
 	}
 
 	/* TIME: Some batteries only provide time to discharge */