From 89b9256ad86ddc2a9fd12d3359bc431df45c6b25 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 20 Jul 2009 17:08:23 -0400
Subject: Port to PolicyKit 1.0 apis

---
 data/Makefile.am                       | 2 +-
 data/org.freedesktop.consolekit.policy | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index fb245b7..041b431 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ seatdir = $(sysconfdir)/ConsoleKit/seats.d
 seat_DATA = 00-primary.seat
 
 if HAVE_POLKIT
-polkit_policydir = $(datadir)/PolicyKit/policy
+polkit_policydir = $(datadir)/polkit-1/actions
 dist_polkit_policy_DATA =	\
 	org.freedesktop.consolekit.policy	\
 	$(NULL)
diff --git a/data/org.freedesktop.consolekit.policy b/data/org.freedesktop.consolekit.policy
index a5953f4..a709b39 100644
--- a/data/org.freedesktop.consolekit.policy
+++ b/data/org.freedesktop.consolekit.policy
@@ -23,7 +23,7 @@ Policy definitions for ConsoleKit
     <message>System policy prevents stopping the system when other users are logged in</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
 
@@ -41,7 +41,7 @@ Policy definitions for ConsoleKit
     <message>System policy prevents restarting the system when other users are logged in</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin_keep_always</allow_active>
+      <allow_active>auth_admin_keep</allow_active>
     </defaults>
   </action>
 
-- 
cgit