move management functions to a separate D-Bus interface and GObject class

This will allow us, in the near future, to declare org.fd.PK1.Authority and
PolkitAuthority as stable while allowing changes to how we manage the (local)
authority even after 1.0.

3 files changed, 70 insertions, 61 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 0a6b4d8..f4b1005 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,6 +28,7 @@ CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = 							\
 	org.freedesktop.PolicyKit1.Authority.xml 		\
+	org.freedesktop.PolicyKit1.AuthorityManager.xml 	\
 	org.freedesktop.PolicyKit1.AuthenticationAgent.xml 	\
 	$(service_in_files) 					\
 	$(dbusconf_in_files) 					\
diff --git a/data/org.freedesktop.PolicyKit1.Authority.xml b/data/org.freedesktop.PolicyKit1.Authority.xml
index e362d7a..e33df65 100644
--- a/data/org.freedesktop.PolicyKit1.Authority.xml
+++ b/data/org.freedesktop.PolicyKit1.Authority.xml
@@ -142,36 +142,8 @@
     </annotation>
   </annotation>
 
-  <!-- Authorization struct -->
-  <annotation name="org.gtk.EggDBus.DeclareStruct" value="Authorization">
-    <annotation name="org.gtk.EggDBus.Struct.Member"  value="s: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="(sa{sv}):subject">
-      <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
-      <annotation name="org.gtk.EggDBus.DocString" value="Subject that the authorization applies to"/>
-    </annotation>
-
-    <annotation name="org.gtk.EggDBus.Struct.Member"  value="b:is_negative">
-      <annotation name="org.gtk.EggDBus.DocString" value="Whether the authorization is negative"/>
-    </annotation>
-  </annotation>
-
   <interface name="org.freedesktop.PolicyKit1.Authority">
 
-    <method name="EnumerateUsers">
-      <arg name="users" direction="out" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
-      </arg>
-    </method>
-
-    <method name="EnumerateGroups">
-      <arg name="groups" direction="out" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
-      </arg>
-    </method>
-
     <method name="EnumerateActions">
       <arg name="locale" direction="in" type="s"/>
       <arg name="action_descriptions" direction="out" type="a(ssssssiiia{ss})">
@@ -193,39 +165,6 @@
       </arg>
     </method>
 
-    <method name="AddAuthorization">
-      <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" 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.StructType" value="Authorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The authorization to add for @identity"/>
-      </arg>
-    </method>
-
-    <method name="RemoveAuthorization">
-      <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" 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.StructType" value="Authorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The authorization to remove from @identity"/>
-      </arg>
-    </method>
-
-    <method name="EnumerateAuthorizations">
-      <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="The identity to enumerate authorizations for"/>
-      </arg>
-      <arg name="authorizations" direction="out" type="a(s(sa{sv})b)">
-        <annotation name="org.gtk.EggDBus.StructType" value="Authorization"/>
-        <annotation name="org.gtk.EggDBus.DocString" value="An array of authorizations for @identity"/>
-      </arg>
-    </method>
-
     <method name="RegisterAuthenticationAgent">
       <arg name="object_path" direction="in" type="s">
         <annotation name="org.gtk.EggDBus.DocString" value="Path of authentication agent object on the unique name of the caller"/>
diff --git a/data/org.freedesktop.PolicyKit1.AuthorityManager.xml b/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
new file mode 100644
index 0000000..5c05fcc
--- /dev/null
+++ b/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
@@ -0,0 +1,69 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+
+  <!-- Authorization struct -->
+  <annotation name="org.gtk.EggDBus.DeclareStruct" value="Authorization">
+    <annotation name="org.gtk.EggDBus.Struct.Member"  value="s: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="(sa{sv}):subject">
+      <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
+      <annotation name="org.gtk.EggDBus.DocString" value="Subject that the authorization applies to"/>
+    </annotation>
+
+    <annotation name="org.gtk.EggDBus.Struct.Member"  value="b:is_negative">
+      <annotation name="org.gtk.EggDBus.DocString" value="Whether the authorization is negative"/>
+    </annotation>
+  </annotation>
+
+  <interface name="org.freedesktop.PolicyKit1.AuthorityManager">
+
+    <method name="EnumerateUsers">
+      <arg name="users" direction="out" type="a(sa{sv})">
+        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
+      </arg>
+    </method>
+
+    <method name="EnumerateGroups">
+      <arg name="groups" direction="out" type="a(sa{sv})">
+        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
+      </arg>
+    </method>
+
+    <method name="AddAuthorization">
+      <arg name="identity" direction="in" type="(sa{sv})">
+        <annotation name="org.gtk.EggDBus.StructType" 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.StructType" value="Authorization"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="The authorization to add for @identity"/>
+      </arg>
+    </method>
+
+    <method name="RemoveAuthorization">
+      <arg name="identity" direction="in" type="(sa{sv})">
+        <annotation name="org.gtk.EggDBus.StructType" 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.StructType" value="Authorization"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="The authorization to remove from @identity"/>
+      </arg>
+    </method>
+
+    <method name="EnumerateAuthorizations">
+      <arg name="identity" direction="in" type="(sa{sv})">
+        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="The identity to enumerate authorizations for"/>
+      </arg>
+      <arg name="authorizations" direction="out" type="a(s(sa{sv})b)">
+        <annotation name="org.gtk.EggDBus.StructType" value="Authorization"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="An array of authorizations for @identity"/>
+      </arg>
+    </method>
+
+  </interface>
+</node>