hal: Branch 'master'

[David Zeuthen]

 tools/hal-device.c |    1 -
 tools/lshal.c      |    1 -
 2 files changed, 2 deletions(-)

New commits:
diff-tree c85e02d58d6503b494bb4c8584a7c44ac6923208 (from 9c99fc03fbac6380032a6678c641a76ef02ad834)
Author: Timo Hoenig <thoenig at suse.de>
Date:   Mon Oct 23 11:35:17 2006 -0400

    don't call dbus_connection_close() for some of our tools
    
    lshal and hal-device should not call dbus_connection_close() as they do
    not have a private connection to the bus.
    
    This is not critical. However, with D-Bus 0.94+ it will spawn ugly error
    messages.  Note: It is safe to apply this patch for HAL when using older
    versions of D-Bus, too.

diff --git a/tools/hal-device.c b/tools/hal-device.c
index 4c5678e..5dd5d8b 100644
--- a/tools/hal-device.c
+++ b/tools/hal-device.c
@@ -161,7 +161,6 @@ int main(int argc, char **argv)
 
 	libhal_ctx_shutdown(hal_ctx, &error);
 	libhal_ctx_free(hal_ctx);
-	dbus_connection_close(conn);
 	dbus_connection_unref(conn);
 	dbus_error_free(&error);
 
diff --git a/tools/lshal.c b/tools/lshal.c
index 377708f..1d3443c 100644
--- a/tools/lshal.c
+++ b/tools/lshal.c
@@ -723,7 +723,6 @@ main (int argc, char *argv[])
 		LIBHAL_FREE_DBUS_ERROR (&error);
 	libhal_ctx_free (hal_ctx);
 
-	dbus_connection_close (conn);
 	dbus_connection_unref (conn);
 
 	if (show_device)