hal: Branch 'master'

[Richard Hughes]

 hald/linux/device.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f018f6480384e2607aa3cac6aad5f114b832ebc0
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jan 2 20:03:58 2008 +0000

    fix the battery reporting when using CONFIG_POWER_SUPPLY
    
    When using CONFIG_ACPI_BATTERY we set battery.is_rechargeable
    but do not set it when using CONFIG_POWER_SUPPLY.
    This causes gnome-power-manager to not report battery status correctly
    on fedora rawhide.
    Add this key if we are setting battery.rechargeable.*

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 8e4e808..b55da25 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -3071,6 +3071,7 @@ refresh_battery_fast (HalDevice *d)
 		} else if (strcasecmp (status, "discharging") == 0) {
 			is_discharging = TRUE;
 		}
+		hal_device_property_set_bool (d, "battery.is_rechargeable", TRUE);
 		hal_device_property_set_bool (d, "battery.rechargeable.is_charging", is_charging);
 		hal_device_property_set_bool (d, "battery.rechargeable.is_discharging", is_discharging);
 	}