hal: Branch 'master'

[Danny Kukawka]

 hald/hald.c                |    3 ++-
 tools/hal-storage-shared.c |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
diff-tree 7f3217196c67ec495796700a2d062242344e8b26 (from 8b320279cfb6a8ce96fcf5f271f7280c825b30a9)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Apr 10 12:33:08 2007 +0200

    fix build without policykit enabled/available
    
    Fixed build without policykit enabled/available. Added some ifdef's.

diff --git a/hald/hald.c b/hald/hald.c
index 23d57a1..a597de8 100644
--- a/hald/hald.c
+++ b/hald/hald.c
@@ -509,8 +509,9 @@ main (int argc, char *argv[])
 	guint sigterm_iochn_listener_source_id;
 	char *path;
 	char newpath[512];
+#ifdef HAVE_POLKIT
         PolKitError *p_error;
-
+#endif
 	openlog ("hald", LOG_PID, LOG_DAEMON);
 
 #ifdef HAVE_MALLOPT
diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
index 64ffa15..88eb71a 100644
--- a/tools/hal-storage-shared.c
+++ b/tools/hal-storage-shared.c
@@ -439,7 +439,7 @@ line_found:
                         libhal_free_string (polkit_result);
                 }
 #else
-                permission_denied_privilege (privilege, "no");
+                permission_denied_privilege (action, "no");
 #endif
 	}
 
@@ -548,7 +548,9 @@ handle_eject (LibHalContext *hal_ctx, 
 	int na;
 	int fd;
 	int num_excl_tries;
+#ifdef HAVE_POLKIT
         DBusError error;
+#endif
 
 	/* When called here all the file systems from this device is
 	 * already unmounted. That's actually guaranteed; see