[Telepathy-commits] [telepathy-gabble/master] Update the spec (GetContactCapabilities), avoid Bug #17329

[Alban Crequy]

---
 .../Connection_Interface_Contact_Capabilities.xml  |    6 ++++--
 src/connection.c                                   |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/extensions/Connection_Interface_Contact_Capabilities.xml b/extensions/Connection_Interface_Contact_Capabilities.xml
index 2dc027b..828b934 100644
--- a/extensions/Connection_Interface_Contact_Capabilities.xml
+++ b/extensions/Connection_Interface_Contact_Capabilities.xml
@@ -54,7 +54,7 @@ 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(a{sv}as)"
+      <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:
@@ -65,7 +65,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </arg>
       <tp:docstring>
-        Returns an array of enhenced capabilities for the given contact handles.
+        Returns an array of enhanced capabilities for the given contact handles.
       </tp:docstring>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
@@ -79,6 +79,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
+
     <tp:struct name="Enhanced_Contact_Capability" array-name="Enhanced_Contact_Capability_List">
       <tp:docstring>
         A struct representing a capability posessed by a contact,
@@ -89,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>
diff --git a/src/connection.c b/src/connection.c
index 345d301..fb90c41 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2379,8 +2379,9 @@ gabble_connection_get_handle_contact_capabilities (GabbleConnection *self,
       target_handle_type_value);
 
   dbus_g_type_struct_set (&monster,
-      0, fixed_properties,
-      1, text_allowed_properties,
+      0, handle,
+      1, fixed_properties,
+      2, text_allowed_properties,
       G_MAXUINT);
 
   g_hash_table_destroy (fixed_properties);
-- 
1.5.6.5