Rip out polkit-local and refactor local authority to only use tmp authz

3 files changed, 1 insertions, 101 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 6422772..0a6b4d8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,13 +22,12 @@ pam_DATA = polkit-1
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = polkit-gobject-1.pc polkit-backend-1.pc polkit-agent-1.pc polkit-local-1.pc
+pkgconfig_DATA = polkit-gobject-1.pc polkit-backend-1.pc polkit-agent-1.pc
 
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = 							\
 	org.freedesktop.PolicyKit1.Authority.xml 		\
-	org.freedesktop.PolicyKit1.LocalAuthority.xml 		\
 	org.freedesktop.PolicyKit1.AuthenticationAgent.xml 	\
 	$(service_in_files) 					\
 	$(dbusconf_in_files) 					\
@@ -36,7 +35,6 @@ EXTRA_DIST = 							\
 	polkit-gobject-1.pc.in 					\
 	polkit-backend-1.pc.in 					\
 	polkit-agent-1.pc.in					\
-	polkit-local-1.pc.in					\
 	$(NULL)
 
 
diff --git a/data/org.freedesktop.PolicyKit1.LocalAuthority.xml b/data/org.freedesktop.PolicyKit1.LocalAuthority.xml
deleted file mode 100644
index d6d263e..0000000
--- a/data/org.freedesktop.PolicyKit1.LocalAuthority.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-
-  <interface name="org.freedesktop.PolicyKit1.LocalAuthority">
-    <annotation name="org.gtk.EggDBus.DocString.Summary" value="Manage the local Authority"/>
-    <annotation name="org.gtk.EggDBus.DocString" value="This D-Bus interface <emphasis>may</emphasis> be implemented by the <literal>/org/freedesktop/PoliycKit1/Authority</literal> object on the well-known name <literal>org.freedesktop.PolicyKit1</literal> on the system message bus."/>
-
-    <!-- Authorization struct -->
-    <annotation name="org.gtk.EggDBus.DeclareStruct" value="LocalAuthorization">
-      <annotation name="org.gtk.EggDBus.DocString.Summary" value="Authorizations"/>
-      <annotation name="org.gtk.EggDBus.DocString" value="This struct describes an authorization belonging to an #Identity."/>
-
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:action_id">
-        <annotation name="org.gtk.EggDBus.DocString" value="Identifier for the action the authorization is for."/>
-      </annotation>
-
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="Subject:subject">
-        <annotation name="org.gtk.EggDBus.Type" value="Subject"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #Subject that the authorization applies to."/>
-      </annotation>
-
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="Boolean:is_negative">
-        <annotation name="org.gtk.EggDBus.DocString" value="Whether the authorization is negative."/>
-      </annotation>
-    </annotation>
-
-    <method name="EnumerateUsers">
-      <annotation name="org.gtk.EggDBus.DocString" value="Enumerate all users known to the authority."/>
-
-      <arg name="users" direction="out" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.Type" value="Array<Identity>"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="An array of #Identity structs."/>
-      </arg>
-    </method>
-
-    <method name="EnumerateGroups">
-      <annotation name="org.gtk.EggDBus.DocString" value="Enumerate all groups known to the authority."/>
-
-      <arg name="groups" direction="out" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.Type" value="Array<Identity>"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="An array of #Identity structs."/>
-      </arg>
-    </method>
-
-    <method name="AddAuthorization">
-      <annotation name="org.gtk.EggDBus.DocString" value="Add an authorization to @identity."/>
-
-      <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.Type" value="Identity"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #Identity to add @authorization to."/>
-      </arg>
-      <arg name="authorization" direction="in" type="(s(sa{sv})b)">
-        <annotation name="org.gtk.EggDBus.Type" value="LocalAuthorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #LocalAuthorization to add to @identity."/>
-      </arg>
-    </method>
-
-    <method name="RemoveAuthorization">
-      <annotation name="org.gtk.EggDBus.DocString" value="Remove an authorization from @identity."/>
-
-      <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.Type" value="Identity"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #Identity to remove @authorization from."/>
-      </arg>
-      <arg name="authorization" direction="in" type="(s(sa{sv})b)">
-        <annotation name="org.gtk.EggDBus.Type" value="LocalAuthorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #LocalAuthorization to remove from @identity."/>
-      </arg>
-    </method>
-
-    <method name="EnumerateAuthorizations">
-      <annotation name="org.gtk.EggDBus.DocString" value="Enumerate all authorizations for @identity."/>
-
-      <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.Type" value="Identity"/>
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="An #Identity to enumerate authorizations for."/>
-      </arg>
-      <arg name="authorizations" direction="out" type="a(s(sa{sv})b)">
-        <annotation name="org.gtk.EggDBus.Type" value="Array<LocalAuthorization>"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="An array of #LocalAuthorization structs for @identity."/>
-      </arg>
-    </method>
-
-  </interface>
-</node>
diff --git a/data/polkit-local-1.pc.in b/data/polkit-local-1.pc.in
deleted file mode 100644
index ab917c1..0000000
--- a/data/polkit-local-1.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: polkit-local-1
-Description: PolicyKit Local Authority API
-Version: @VERSION@
-Libs: -L${libdir} -lpolkit-local-1
-Cflags: -I${includedir}/polkit-1
-Requires: polkit-gobject-1