Move local authority management to a separate library

3 files changed, 23 insertions, 11 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index f4b1005..6422772 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,13 +22,13 @@ pam_DATA = polkit-1
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = polkit-gobject-1.pc polkit-backend-1.pc polkit-agent-1.pc
+pkgconfig_DATA = polkit-gobject-1.pc polkit-backend-1.pc polkit-agent-1.pc polkit-local-1.pc
 
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = 							\
 	org.freedesktop.PolicyKit1.Authority.xml 		\
-	org.freedesktop.PolicyKit1.AuthorityManager.xml 	\
+	org.freedesktop.PolicyKit1.LocalAuthority.xml 		\
 	org.freedesktop.PolicyKit1.AuthenticationAgent.xml 	\
 	$(service_in_files) 					\
 	$(dbusconf_in_files) 					\
@@ -36,6 +36,7 @@ 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.AuthorityManager.xml b/data/org.freedesktop.PolicyKit1.LocalAuthority.xml
index 053056c..d6d263e 100644
--- a/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
+++ b/data/org.freedesktop.PolicyKit1.LocalAuthority.xml
@@ -2,12 +2,12 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
 
-  <interface name="org.freedesktop.PolicyKit1.AuthorityManager">
-    <annotation name="org.gtk.EggDBus.DocString.Summary" value="Manage an Authority"/>
+  <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="Authorization">
+    <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."/>
 
@@ -51,8 +51,8 @@
         <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="Authorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #Authorization to add to @identity."/>
+        <annotation name="org.gtk.EggDBus.Type" value="LocalAuthorization"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="The #LocalAuthorization to add to @identity."/>
       </arg>
     </method>
 
@@ -64,8 +64,8 @@
         <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="Authorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The #Authorization to remove from @identity."/>
+        <annotation name="org.gtk.EggDBus.Type" value="LocalAuthorization"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="The #LocalAuthorization to remove from @identity."/>
       </arg>
     </method>
 
@@ -78,8 +78,8 @@
         <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<Authorization>"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="An array of #Authorization structs for @identity."/>
+        <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>
 
diff --git a/data/polkit-local-1.pc.in b/data/polkit-local-1.pc.in
new file mode 100644
index 0000000..ab917c1
--- /dev/null
+++ b/data/polkit-local-1.pc.in
@@ -0,0 +1,11 @@
+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