remove attributes from AuthorizationClaim and CheckClaim()

diff --git a/data/org.freedesktop.PolicyKit1.Authority.xml b/data/org.freedesktop.PolicyKit1.Authority.xml
index f99855e..6ebba5b 100644 (file)
--- a/data/org.freedesktop.PolicyKit1.Authority.xml
+++ b/data/org.freedesktop.PolicyKit1.Authority.xml
@@ -55,11 +55,6 @@
     <annotation name="org.gtk.EggDBus.Struct.Member"  value="s:action_id">
       <annotation name="org.gtk.EggDBus.DocString" value="Action Identifier for the claim"/>
     </annotation>
-
-    <annotation name="org.gtk.EggDBus.Struct.Member"  value="a{ss}:attributes">
-      <annotation name="org.gtk.EggDBus.DocString" value="Attributes for the claim"/>
-    </annotation>
-
   </annotation>
 
   <!-- The error domain used for reporting errors -->
@@ -102,13 +97,12 @@
     </method>
 
     <method name="CheckClaim">
-      <arg name="claim" direction="in" type="((sa{sv})sa{ss})">
+      <arg name="claim" direction="in" type="((sa{sv})s)">
         <annotation name="org.gtk.EggDBus.StructType" value="AuthorizationClaim"/>
       </arg>
       <arg name="result" direction="out" type="i">
         <annotation name="org.gtk.EggDBus.EnumType" value="AuthorizationResult"/>
       </arg>
-      <arg name="attributes" direction="out" type="a{ss}"/>
     </method>
 
   </interface>

diff --git a/src/polkit/polkitauthority.c b/src/polkit/polkitauthority.c
index 018de0f..dbf02b9 100644 (file)
--- a/src/polkit/polkitauthority.c
+++ b/src/polkit/polkitauthority.c
@@ -470,7 +470,6 @@ polkit_authority_check_claim_finish (PolkitAuthority          *authority,
                                      GError                  **error)
 {
   _PolkitAuthorizationResult result;
-  EggDBusHashMap *result_attributes;
   GSimpleAsyncResult *simple;
   GAsyncResult *real_res;
 
@@ -483,15 +482,10 @@ polkit_authority_check_claim_finish (PolkitAuthority          *authority,
 
   if (!_polkit_authority_check_claim_finish (authority->real,
                                              &result,
-                                             &result_attributes,
                                              real_res,
                                              error))
     goto out;
 
-  /* TODO: pass these back? */
-  if (result_attributes != NULL)
-    g_object_unref (result_attributes);
-
  out:
   g_object_unref (real_res);
   return result;

diff --git a/src/polkitbackend/polkitbackendserver.c b/src/polkitbackend/polkitbackendserver.c
index e9557a1..3da541e 100644 (file)
--- a/src/polkitbackend/polkitbackendserver.c
+++ b/src/polkitbackend/polkitbackendserver.c
@@ -231,15 +231,8 @@ void
 polkit_backend_authority_check_claim_finish (PolkitBackendPendingCall  *pending_call,
                                              PolkitAuthorizationResult  result)
 {
-  EggDBusHashMap *attributes;
-
-  attributes = egg_dbus_hash_map_new (G_TYPE_STRING, g_free, G_TYPE_STRING, g_free);
-
   _polkit_authority_handle_check_claim_finish (_polkit_backend_pending_call_get_method_invocation (pending_call),
-                                               result,
-                                               attributes);
-
-  g_object_unref (attributes);
+                                               result);
 
   g_object_unref (pending_call);
 }