split Subject into Subject and Identity and revise API

... also remove EnumerateSessions

1 files changed, 31 insertions, 11 deletions

diff --git a/data/org.freedesktop.PolicyKit1.Authority.xml b/data/org.freedesktop.PolicyKit1.Authority.xml
index f258c53..6b33bc1 100644
--- a/data/org.freedesktop.PolicyKit1.Authority.xml
+++ b/data/org.freedesktop.PolicyKit1.Authority.xml
@@ -17,6 +17,21 @@
 
   </annotation>
 
+  <!-- Identity struct -->
+  <annotation name="org.gtk.EggDBus.DeclareStruct" value="Identity">
+
+    <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:identity_kind">
+      <annotation name="org.gtk.EggDBus.DocString" value="Kind of identity"/>
+    </annotation>
+
+    <annotation name="org.gtk.EggDBus.Struct.Member"  value="a{sv}:identity_details">
+      <annotation name="org.gtk.EggDBus.DocString" value="Details about the identity"/>
+    </annotation>
+
+    <!-- TODO: document values in hash map for each identity type-->
+
+  </annotation>
+
   <!-- ActionDescription struct -->
   <annotation name="org.gtk.EggDBus.DeclareStruct" value="ActionDescription">
 
@@ -99,19 +114,13 @@
 
     <method name="EnumerateUsers">
       <arg name="users" direction="out" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
+        <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="Subject"/>
-      </arg>
-    </method>
-
-    <method name="EnumerateSessions">
-      <arg name="sessions" direction="out" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
+        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
       </arg>
     </method>
 
@@ -137,26 +146,37 @@
     </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="subject" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
+      <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>