update for latest EggDBus changes

3 files changed, 40 insertions, 38 deletions

diff --git a/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml b/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
index 9b2a5d5..2faa2cf 100644
--- a/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
+++ b/data/org.freedesktop.PolicyKit1.AuthenticationAgent.xml
@@ -19,7 +19,8 @@
       </arg>
 
       <arg name="identities" direction="in" type="a(sa{sv})">
-        <annotation name="org.gtk.EggDBus.DocString" value="A list of #Identity structs that the user can use for authentication."/>
+        <annotation name="org.gtk.EggDBus.Type" value="Array<Identity>"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="An array of #Identity structs that the user can use for authentication."/>
       </arg>
     </method>
 
diff --git a/data/org.freedesktop.PolicyKit1.Authority.xml b/data/org.freedesktop.PolicyKit1.Authority.xml
index e0eb900..711dc4a 100644
--- a/data/org.freedesktop.PolicyKit1.Authority.xml
+++ b/data/org.freedesktop.PolicyKit1.Authority.xml
@@ -11,11 +11,11 @@
       <annotation name="org.gtk.EggDBus.DocString.Summary" value="Subjects"/>
       <annotation name="org.gtk.EggDBus.DocString" value="<para>This struct describes subjects such as UNIX processes. It is typically used to check if a given process is authorized for an action.</para><para>TODO: document required/optional key/value pairs in @subject_details.</para>"/>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:subject_kind">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:subject_kind">
         <annotation name="org.gtk.EggDBus.DocString" value="The type of the subject."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="a{sv}:subject_details">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="Dict<String,Variant>:subject_details">
         <annotation name="org.gtk.EggDBus.DocString" value="Details about the subject. Depending of the value of @subject_kind, a set of well-defined key/value pairs are guaranteed to be available."/>
       </annotation>
 
@@ -26,11 +26,11 @@
       <annotation name="org.gtk.EggDBus.DocString.Summary" value="Subjects"/>
       <annotation name="org.gtk.EggDBus.DocString" value="<para>This struct describes identities such as UNIX users and UNIX groups. It is typically used to check if a given process is authorized for an action.</para><para>TODO: document required/optional key/value pairs in @identity_details.</para>"/>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:identity_kind">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:identity_kind">
         <annotation name="org.gtk.EggDBus.DocString" value="Type of identity."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="a{sv}:identity_details">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="Dict<String,Variant>:identity_details">
         <annotation name="org.gtk.EggDBus.DocString" value="Details about the identity. Depending of the value of @identity_kind, a set of well-defined key/value pairs are guaranteed to be available."/>
       </annotation>
 
@@ -43,46 +43,46 @@
       <annotation name="org.gtk.EggDBus.DocString.Summary" value="Actions"/>
       <annotation name="org.gtk.EggDBus.DocString" value="This struct describes actions registered with the PolicyKit daemon."/>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:action_id">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:action_id">
         <annotation name="org.gtk.EggDBus.DocString" value="Action Identifier."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:description">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:description">
         <annotation name="org.gtk.EggDBus.DocString" value="Localized description of the action."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:message">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:message">
         <annotation name="org.gtk.EggDBus.DocString" value="Localized message to be displayed when making the user authenticate for an action."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:vendor_name">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:vendor_name">
         <annotation name="org.gtk.EggDBus.DocString" value="Name of the provider of the action or the empty string."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:vendor_url">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:vendor_url">
         <annotation name="org.gtk.EggDBus.DocString" value="A URL pointing to a place with more information about the action or the empty string."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:icon_name">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="String:icon_name">
         <annotation name="org.gtk.EggDBus.DocString" value="The themed icon describing the action or the empty string if no icon is set."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="i:implicit_any">
-        <annotation name="org.gtk.EggDBus.EnumType" value="ImplicitAuthorization"/>
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="ImplicitAuthorization:implicit_any">
+        <annotation name="org.gtk.EggDBus.Type" value="ImplicitAuthorization"/>
         <annotation name="org.gtk.EggDBus.DocString" value="A value from the #ImplicitAuthorization enumeration for implicit authorizations that apply to any #Subject."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="i:implicit_inactive">
-        <annotation name="org.gtk.EggDBus.EnumType" value="ImplicitAuthorization"/>
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="ImplicitAuthorization:implicit_inactive">
+        <annotation name="org.gtk.EggDBus.Type" value="ImplicitAuthorization"/>
         <annotation name="org.gtk.EggDBus.DocString" value="A value from the #ImplicitAuthorization enumeration for implicit authorizations that apply any #Subject in an inactive user session on the local console."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="i:implicit_active">
-        <annotation name="org.gtk.EggDBus.EnumType" value="ImplicitAuthorization"/>
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="ImplicitAuthorization:implicit_active">
+        <annotation name="org.gtk.EggDBus.Type" value="ImplicitAuthorization"/>
         <annotation name="org.gtk.EggDBus.DocString" value="A value from the #ImplicitAuthorization enumeration for implicit authorizations that apply any #Subject in an active user session on the local console."/>
       </annotation>
 
-      <annotation name="org.gtk.EggDBus.Struct.Member"  value="a{ss}:annotations">
+      <annotation name="org.gtk.EggDBus.Struct.Member"  value="Dict<String,String>:annotations">
         <annotation name="org.gtk.EggDBus.DocString" value="Annotations for the action."/>
       </annotation>
 
@@ -168,9 +168,9 @@
         <annotation name="org.gtk.EggDBus.DocString" value="The locale to get descriptions in or the blank string to use the system locale."/>
       </arg>
 
-      <arg name="action_descriptions" direction="out" type="a(ssssssiiia{ss})">
+      <arg name="action_descriptions" direction="out" type="a(ssssssuuua{ss})">
+        <annotation name="org.gtk.EggDBus.Type" value="Array<ActionDescription>"/>
         <annotation name="org.gtk.EggDBus.DocString" value="An array of #ActionDescription structs."/>
-        <annotation name="org.gtk.EggDBus.StructType" value="ActionDescription"/>
       </arg>
     </method>
 
@@ -179,21 +179,21 @@
 
       <arg name="subject" direction="in" type="(sa{sv})">
         <annotation name="org.gtk.EggDBus.DocString" value="A #Subject struct."/>
-        <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
+        <annotation name="org.gtk.EggDBus.Type" value="Subject"/>
       </arg>
 
       <arg name="action_id" direction="in" type="s">
         <annotation name="org.gtk.EggDBus.DocString" value="Identifier for the action that @subject is attempting to do."/>
       </arg>
 
-      <arg name="flags" direction="in" type="i">
+      <arg name="flags" direction="in" type="u">
+        <annotation name="org.gtk.EggDBus.Type" value="CheckAuthorizationFlags"/>
         <annotation name="org.gtk.EggDBus.DocString" value="A set of #CheckAuthorizationFlags."/>
-        <annotation name="org.gtk.EggDBus.FlagsType" value="CheckAuthorizationFlags"/>
       </arg>
 
-      <arg name="result" direction="out" type="i">
-        <annotation name="org.gtk.EggDBus.DocString" value="A value from #AuthorizationResult enumeration."/>
-        <annotation name="org.gtk.EggDBus.EnumType" value="AuthorizationResult"/>
+      <arg name="result" direction="out" type="u">
+        <annotation name="org.gtk.EggDBus.Type" value="AuthorizationResult"/>
+        <annotation name="org.gtk.EggDBus.DocString" value="A value from the #AuthorizationResult enumeration."/>
       </arg>
     </method>
 
@@ -221,7 +221,7 @@
       </arg>
 
       <arg name="identity" direction="in" type="(sa{sv})">
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
+        <annotation name="org.gtk.EggDBus.Type" value="Identity"/>
         <annotation name="org.gtk.EggDBus.DocString" value="A #Identity struct describing what identity was authenticated."/>
       </arg>
     </method>
diff --git a/data/org.freedesktop.PolicyKit1.AuthorityManager.xml b/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
index d859e0a..053056c 100644
--- a/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
+++ b/data/org.freedesktop.PolicyKit1.AuthorityManager.xml
@@ -11,16 +11,16 @@
       <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="s:action_id">
+      <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="(sa{sv}):subject">
-        <annotation name="org.gtk.EggDBus.StructType" value="Subject"/>
+      <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="b:is_negative">
+      <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>
@@ -29,8 +29,8 @@
       <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."/>
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
       </arg>
     </method>
 
@@ -38,8 +38,8 @@
       <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."/>
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
       </arg>
     </method>
 
@@ -47,12 +47,12 @@
       <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."/>
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
       </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.StructType" value="Authorization"/>
       </arg>
     </method>
 
@@ -60,12 +60,12 @@
       <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."/>
-        <annotation name="org.gtk.EggDBus.StructType" value="Identity"/>
       </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.StructType" value="Authorization"/>
       </arg>
     </method>
 
@@ -73,11 +73,12 @@
       <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.StructType" value="Authorization"/>
+        <annotation name="org.gtk.EggDBus.Type" value="Array<Authorization>"/>
         <annotation name="org.gtk.EggDBus.DocString" value="An array of #Authorization structs for @identity."/>
       </arg>
     </method>