hal: Branch 'master'

[David Zeuthen]

 hald/access-check.c  |    8 ++++----
 tools/hal-acl-tool.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
diff-tree 36c552bcaf7cae5e880f46e67ddeacf4a3c38131 (from b20d801f2d25e727d0461e903ca6d8c6d38b3f72)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 8 02:10:16 2007 -0400

    libpolkit changed a bit; update to new API

diff --git a/hald/access-check.c b/hald/access-check.c
index d0e4018..9ab7f54 100644
--- a/hald/access-check.c
+++ b/hald/access-check.c
@@ -301,10 +301,10 @@ access_check_caller_have_access_to_devic
         pk_privilege = libpolkit_privilege_new ();
         libpolkit_privilege_set_privilege_id (pk_privilege, privilege);
 
-        pk_result = libpolkit_can_caller_access_resource (pk_context,
-                                                          pk_privilege,
-                                                          pk_resource,
-                                                          pk_caller);
+        pk_result = libpolkit_context_can_caller_access_resource (pk_context,
+                                                                  pk_privilege,
+                                                                  pk_resource,
+                                                                  pk_caller);
 
         if (polkit_result_out != NULL)
                 *polkit_result_out = pk_result;
diff --git a/tools/hal-acl-tool.c b/tools/hal-acl-tool.c
index 1c5249c..b19d283 100644
--- a/tools/hal-acl-tool.c
+++ b/tools/hal-acl-tool.c
@@ -657,10 +657,10 @@ acl_device_added_visitor (const char *se
                 g_free (priv_name);
 
                 /* Now ask PolicyKit if the given session should have access */
-                pk_result = libpolkit_can_session_access_resource (pk_context, 
-                                                                   pk_privilege,
-                                                                   pk_resource,
-                                                                   pk_session);
+                pk_result = libpolkit_context_can_session_access_resource (pk_context, 
+                                                                           pk_privilege,
+                                                                           pk_resource,
+                                                                           pk_session);
                 if (pk_result == LIBPOLKIT_RESULT_YES) {
 			afd_grant_to_uid (afd, session_uid);
                 }