[Telepathy-commits] [telepathy-spec/master] Don't use too complex type in GetContactCapabilities because of a bug in dbus-glib: Bug #17329

[Alban Crequy]

---
 spec/Connection_Interface_Contact_Capabilities.xml |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/spec/Connection_Interface_Contact_Capabilities.xml b/spec/Connection_Interface_Contact_Capabilities.xml
index 38f6026..828b934 100644
--- a/spec/Connection_Interface_Contact_Capabilities.xml
+++ b/spec/Connection_Interface_Contact_Capabilities.xml
@@ -54,8 +54,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           <p>The handle zero MUST NOT be included in the request.</p>
         </tp:docstring>
       </arg>
-      <arg direction="out" type="a{ua(a{sv}as)}"
-           tp:type="Handle_Enhanced_Contact_Capabilities_Map">
+      <arg direction="out" type="a(ua{sv}as)"
+           tp:type="Enhanced_Contact_Capability[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structures containing:
           <ul>
@@ -79,13 +79,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <tp:mapping name="Handle_Enhanced_Contact_Capabilities_Map">
-      <tp:docstring>A mapping from contact handle to Enhanced_Contact_Capability.</tp:docstring>
-      <tp:member type="u" name="Handle"/>
-      <tp:member type="a(a{sv}as)" tp:type="Enhanced_Contact_Capability[]"
-                 name="EnhancedContactCapability"/>
-    </tp:mapping>
-
 
     <tp:struct name="Enhanced_Contact_Capability" array-name="Enhanced_Contact_Capability_List">
       <tp:docstring>
@@ -97,6 +90,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         the request contains a property which does not belong to
         Fixed_Properties nor to Allowed_Properties, the request will fail.
       </tp:docstring>
+      <tp:member type="u" tp:type="Contact_Handle" name="Handle"/>
       <tp:member type="a{sv}" tp:type="String_Variant_Map"
                  name="Fixed_Properties">
         <tp:docstring>
-- 
1.5.6.5