hal: Branch 'master'

[Danny Kukawka]

 tools/hal-storage-shared.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

New commits:
diff-tree 0838c5af65a125481b660341a36877963a6a25dc (from 300bc55cab181b3e1437efeb68c62b960b612125)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jan 12 21:55:36 2007 +0100

    changed error handling for hal-storage-shared.c
    
    Changed error handling to differ between a real error while
    get volume.ignore and return true as value which should call
    permission_denied_volume_ignore().

diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
index bdbd14d..19e1819 100644
--- a/tools/hal-storage-shared.c
+++ b/tools/hal-storage-shared.c
@@ -289,14 +289,15 @@ handle_unmount (LibHalContext *hal_ctx, 
 
 	if (volume != NULL) {
 		dbus_error_init (&error);
-		if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", &error) || 
-		    dbus_error_is_set (&error)) {
-			if (dbus_error_is_set (&error)) {
-				dbus_error_free (&error);
-			}
+		if (libhal_device_get_property_bool (hal_ctx, udi, "volume.ignore", &error)) { 
 			permission_denied_volume_ignore (device);
 		}
 
+		if (dbus_error_is_set (&error)) {
+			dbus_error_free(&error);
+			unknown_error("Error while get volume.ignore");
+		}
+
 		if (!libhal_volume_is_mounted (volume)) {
 			not_mounted ("According to HAL, the volume is not mounted");
 		}