hal: Branch 'master'

[Danny Kukawka]

 libhal/libhal.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 781c3d56b2e86a5fc5babffb63212edeb3f09583 (from 521e0e73d7f5d999289afa1a81c370451e6428d6)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Aug 9 13:37:56 2007 +0200

    fixed return type of libhal_ctx_init_direct()
    
    Fixed one return of libhal_ctx_init_direct() to return not FALSE,
    but correct LibHalContext* if dbus_connection_add_filter() fail.

diff --git a/libhal/libhal.c b/libhal/libhal.c
index a5d18a2..d338ff2 100644
--- a/libhal/libhal.c
+++ b/libhal/libhal.c
@@ -3367,7 +3367,9 @@ libhal_ctx_init_direct (DBusError *error
 	}
 
 	if (!dbus_connection_add_filter (ctx->connection, filter_func, ctx, NULL)) {
-		return FALSE;
+		libhal_ctx_free (ctx);
+		ctx = NULL;
+		goto out;
 	}