Imported Upstream version 0.3.0upstream/0.3.0

4 files changed, 14 insertions, 8 deletions

diff --git a/data/ConsoleKit.conf b/data/ConsoleKit.conf
index 70a0423..dbe29f8 100644
--- a/data/ConsoleKit.conf
+++ b/data/ConsoleKit.conf
@@ -64,6 +64,8 @@
     <allow send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetSeatId"/>
     <allow send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="GetLoginSessionId"/>
+    <allow send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetSessionType"/>
     <allow send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetUser"/>
diff --git a/data/Makefile.am b/data/Makefile.am
index ef13d8c..ca51570 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,7 @@ seat_DATA = 00-primary.seat
 if HAVE_POLKIT
 polkit_policydir = $(datadir)/PolicyKit/policy
 dist_polkit_policy_DATA =	\
-	ConsoleKit.policy	\
+	org.freedesktop.consolekit.policy	\
 	$(NULL)
 endif
 
diff --git a/data/Makefile.in b/data/Makefile.in
index bfc4196..9a2e429 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@ am__installdirs = "$(DESTDIR)$(dbusconfdir)" \
 	"$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(seatdir)" \
 	"$(DESTDIR)$(servicedir)"
 dbusconfDATA_INSTALL = $(INSTALL_DATA)
-am__dist_polkit_policy_DATA_DIST = ConsoleKit.policy
+am__dist_polkit_policy_DATA_DIST = org.freedesktop.consolekit.policy
 dist_polkit_policyDATA_INSTALL = $(INSTALL_DATA)
 seatDATA_INSTALL = $(INSTALL_DATA)
 serviceDATA_INSTALL = $(INSTALL_DATA)
@@ -91,6 +91,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -130,6 +131,7 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -149,6 +151,7 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 RBAC_LIBS = @RBAC_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -159,6 +162,7 @@ VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
 XMLTO = @XMLTO@
+XSLTPROC = @XSLTPROC@
 Z_LIBS = @Z_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -218,7 +222,7 @@ seatdir = $(sysconfdir)/ConsoleKit/seats.d
 seat_DATA = 00-primary.seat
 @HAVE_POLKIT_TRUE@polkit_policydir = $(datadir)/PolicyKit/policy
 @HAVE_POLKIT_TRUE@dist_polkit_policy_DATA = \
-@HAVE_POLKIT_TRUE@	ConsoleKit.policy	\
+@HAVE_POLKIT_TRUE@	org.freedesktop.consolekit.policy	\
 @HAVE_POLKIT_TRUE@	$(NULL)
 
 servicedir = $(datadir)/dbus-1/system-services
diff --git a/data/ConsoleKit.policy b/data/org.freedesktop.consolekit.policy
index e691b0b..a5953f4 100644
--- a/data/ConsoleKit.policy
+++ b/data/org.freedesktop.consolekit.policy
@@ -20,10 +20,10 @@ Policy definitions for ConsoleKit
 
   <action id="org.freedesktop.consolekit.system.stop-multiple-users">
     <description>Stop the system when multiple users are logged in</description>
-    <message>System policy prevents stopping the when other users are logged in</message>
+    <message>System policy prevents stopping the system when other users are logged in</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>auth_admin</allow_active>
+      <allow_active>auth_admin_keep_always</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</allow_active>
+      <allow_active>auth_admin_keep_always</allow_active>
     </defaults>
   </action>