hal: Branch 'master'

[Danny Kukawka]

 tools/lshal.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 7e2746db50ffdebc75958d6e2b87e88d983a92b4 (from 0e7375f0196a55d095c8fb890bdd1b9f5e51bef0)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sun Aug 13 16:43:58 2006 +0200

    replaced LIBHAL_FREE_DBUS_ERROR with dbus_error_free()
    
    Replaced usage of macro LIBHAL_FREE_DBUS_ERROR with dbus_error_free().
    NOTE: if you use dbus_error_is_set() to check if the error is set,
          you should not use LIBHAL_FREE_DBUS_ERROR to free the error.
          Better use dbus_error_free() directly in this case to avoid
          double call of dbus_error_is_set().

diff --git a/tools/lshal.c b/tools/lshal.c
index 683f9b3..c837c7f 100644
--- a/tools/lshal.c
+++ b/tools/lshal.c
@@ -462,7 +462,7 @@ print_property (const char *udi, const c
 	}
 
 	if (dbus_error_is_set (&error))
-		LIBHAL_FREE_DBUS_ERROR (&error);
+		dbus_error_free (&error);
 }
 
 /** Invoked when a property of a device in the Global Device List is