hal: Branch 'master' - 2 commits

[Danny Kukawka]

 configure.in    |    2 +-
 libhal/libhal.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3c10878db0df072ca81ec6de199fa060feb00bf5
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Tue Feb 26 14:17:47 2008 +0100

    fix crash in libhal_ctx_shutdown
    
    This fixes a crash in libhal, found when libhal_ctx_shutdown is called
    while system bus was shutdown.
    
    It ensures the way dbus error has handled in libhal_ctx_shutdown is the
    same as the other functions in libhal.c (and it no longer crashes as a
    bonus).

diff --git a/libhal/libhal.c b/libhal/libhal.c
index a3c18a5..71801e0 100644
--- a/libhal/libhal.c
+++ b/libhal/libhal.c
@@ -3477,8 +3477,8 @@ libhal_ctx_shutdown (LibHalContext *ctx, DBusError *error)
 				       "interface='org.freedesktop.Hal.Manager',"
 				       "sender='org.freedesktop.Hal',"
 				       "path='/org/freedesktop/Hal/Manager'", &myerror);
-		if (dbus_error_is_set (&myerror)) {
-			dbus_move_error (&myerror, error);
+		dbus_move_error (&myerror, error);
+		if (error != NULL && dbus_error_is_set (error)) {
 			fprintf (stderr, "%s %d : Error unsubscribing to signals, error=%s\n", 
 				 __FILE__, __LINE__, error->message);
 			/** @todo  clean up */
commit fdeb05d72e7779241cc6dc73815b6d6a1db591e9
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Tue Feb 26 14:13:03 2008 +0100

    fixed unneeded libusb linking within libhal
    
    I did some dependency review and I realized that when libusb is found,
    we link libhal against libusb. This is totally unneeded and drags in
    additional dependencies for applications using libhal.
    
    The reason for it is a broken AC_CHECK_LIB usage. The attached patch
    fixes it.

diff --git a/configure.in b/configure.in
index d9efb89..44bffb8 100644
--- a/configure.in
+++ b/configure.in
@@ -390,7 +390,7 @@ AC_ARG_ENABLE([usb],
 if test "x$use_usb" = "xyes" ; then
 	AC_CHECK_HEADERS([usb.h], [USE_LIBUSB=yes], [USE_LIBUSB=no])
 	if test "x$USE_LIBUSB" = "xyes"; then
-		AC_CHECK_LIB([usb], [usb_find_devices], [], [USE_LIBUSB=no])
+		AC_CHECK_LIB([usb], [usb_find_devices], [USE_LIBUSB=yes], [USE_LIBUSB=no])
 	fi
 else
     	USE_LIBUSB=no