hal: Branch 'master'

[Danny Kukawka]

 libhal-storage/libhal-storage.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 818b6de6599eac64f6879b543ded5f96059de0af (from 89248c8d6f604235da02ad1168651830cd10ee3f)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Sep 11 20:31:06 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/libhal-storage/libhal-storage.c b/libhal-storage/libhal-storage.c
index 3ddcad5..7395229 100644
--- a/libhal-storage/libhal-storage.c
+++ b/libhal-storage/libhal-storage.c
@@ -1238,7 +1238,7 @@ libhal_volume_from_udi (LibHalContext *h
 	return vol;
 error:
 	if (dbus_error_is_set (&error)) {
-		LIBHAL_FREE_DBUS_ERROR(&error);
+		dbus_error_free (&error);
 	}
 	libhal_free_string (vol_fsusage_textual);
 	libhal_free_string (disc_type_textual);