hal: Branch 'master'

[Richard Hughes]

 hald/linux/addons/addon-acpi.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree 8a485fbd3ad451c8a76b72d26d674c43545e6644 (from bf8be88f49fcbbc9e84929e3aa7cad58679f3353)
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Jul 26 19:08:15 2007 +0100

    initialise the error in the acpi watcher
    
    Sometimes the acpi addon quits when none
    of the known cases get hit. This trivial
    patch initialises the error only at startup
    and stops the 'pressing fn on a x60' causes
    gnome-power-manager to stop noticing events
    
    This should fix jrb's laptop.

diff --git a/hald/linux/addons/addon-acpi.c b/hald/linux/addons/addon-acpi.c
index 686e6e3..5a67c1d 100644
--- a/hald/linux/addons/addon-acpi.c
+++ b/hald/linux/addons/addon-acpi.c
@@ -179,6 +179,7 @@ main_loop (LibHalContext *ctx, FILE *eve
 	DBusError error;
 	char event[256];
 
+	dbus_error_init (&error);
 	while (fgets (event, sizeof event, eventfp))
 	{
 		HAL_DEBUG (("event is '%s'", event));