[telepathy-glib/master] Enable ContactCapabilities code generation and document the result

[Simon McVittie]

---
 docs/reference/telepathy-glib-sections.txt |   39 ++++++++++++++++++++++++++++
 telepathy-glib/connection.xml              |    1 +
 telepathy-glib/extra-gtkdoc.h              |   16 +++++++----
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index dc20828..34de9a7 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -916,6 +916,22 @@ TP_TYPE_SVC_CONNECTION_INTERFACE_CAPABILITIES
 tp_svc_connection_interface_capabilities_get_type
 TP_SVC_CONNECTION_INTERFACE_CAPABILITIES_GET_CLASS
 <SUBSECTION>
+TpSvcConnectionInterfaceContactCapabilities
+TpSvcConnectionInterfaceContactCapabilitiesClass
+tp_svc_connection_interface_contact_capabilities_emit_contact_capabilities_changed
+tp_svc_connection_interface_contact_capabilities_get_contact_capabilities_impl
+tp_svc_connection_interface_contact_capabilities_return_from_get_contact_capabilities
+tp_svc_connection_interface_contact_capabilities_implement_get_contact_capabilities
+tp_svc_connection_interface_contact_capabilities_update_capabilities_impl
+tp_svc_connection_interface_contact_capabilities_return_from_update_capabilities
+tp_svc_connection_interface_contact_capabilities_implement_update_capabilities
+<SUBSECTION Standard>
+TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
+TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
+TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
+tp_svc_connection_interface_contact_capabilities_get_type
+TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_GET_CLASS
+<SUBSECTION>
 TpSvcConnectionInterfaceLocation
 TpSvcConnectionInterfaceLocationClass
 tp_svc_connection_interface_location_emit_location_updated
@@ -1109,6 +1125,12 @@ TP_ARRAY_TYPE_ALIAS_PAIR_LIST
 # Connection - Avatars
 TP_HASH_TYPE_AVATAR_TOKEN_MAP
 <SUBSECTION>
+# Connection - ContactCapabilities
+TP_HASH_TYPE_CONTACT_CAPABILITIES_MAP
+TP_ARRAY_TYPE_CONTACT_CAPABILITIES_MAP_LIST
+TP_STRUCT_TYPE_HANDLER_CAPABILITIES
+TP_ARRAY_TYPE_HANDLER_CAPABILITIES_LIST
+<SUBSECTION>
 # Connection - Capabilities
 TP_STRUCT_TYPE_CAPABILITY_CHANGE
 TP_ARRAY_TYPE_CAPABILITY_CHANGE_LIST
@@ -1211,10 +1233,12 @@ tp_type_dbus_array_dsus
 tp_type_dbus_array_oa_7bsv_7d
 tp_type_dbus_array_of_a_7bsv_7d
 tp_type_dbus_array_of_a_7bss_7d
+tp_type_dbus_array_of_a_7bua_28a_7bsv_7das_29_7d
 tp_type_dbus_array_of_o
 tp_type_dbus_array_os
 tp_type_dbus_array_osuu
 tp_type_dbus_array_sa_28usuussduss_29
+tp_type_dbus_array_saa_7bsv_7das
 tp_type_dbus_array_sq
 tp_type_dbus_array_su
 tp_type_dbus_array_susv
@@ -1238,6 +1262,7 @@ tp_type_dbus_hash_ss
 tp_type_dbus_hash_sv
 tp_type_dbus_hash_u_28ua_7bsa_7bsv_7d_7d_29
 tp_type_dbus_hash_u_28uss_29
+tp_type_dbus_hash_ua_28a_7bsv_7das_29
 tp_type_dbus_hash_ua_7bsv_7d
 tp_type_dbus_hash_uau
 tp_type_dbus_hash_us
@@ -1250,6 +1275,7 @@ tp_type_dbus_struct_oa_7bsv_7d
 tp_type_dbus_struct_os
 tp_type_dbus_struct_osuu
 tp_type_dbus_struct_sa_28usuussduss_29
+tp_type_dbus_struct_saa_7bsv_7das
 tp_type_dbus_struct_sq
 tp_type_dbus_struct_su
 tp_type_dbus_struct_susv
@@ -1942,6 +1968,8 @@ TP_IFACE_CONNECTION_INTERFACE_AVATARS
 TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS
 TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES
 TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES
+TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
+TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
 TP_IFACE_CONNECTION_INTERFACE_CONTACTS
 TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS
 TP_IFACE_CONNECTION_INTERFACE_REQUESTS
@@ -2053,6 +2081,7 @@ tp_iface_quark_connection
 tp_iface_quark_connection_interface_aliasing
 tp_iface_quark_connection_interface_avatars
 tp_iface_quark_connection_interface_contacts
+tp_iface_quark_connection_interface_contact_capabilities
 tp_iface_quark_connection_interface_capabilities
 tp_iface_quark_connection_interface_requests
 tp_iface_quark_connection_interface_simple_presence
@@ -2633,8 +2662,18 @@ tp_cli_connection_interface_avatars_signal_callback_avatar_updated
 <FILE>connection-caps</FILE>
 <TITLE>connection-caps</TITLE>
 <INCLUDE>telepathy-glib/connection.h</INCLUDE>
+tp_cli_connection_interface_contact_capabilities_callback_for_get_contact_capabilities
+tp_cli_connection_interface_contact_capabilities_call_get_contact_capabilities
+tp_cli_connection_interface_contact_capabilities_callback_for_update_capabilities
+tp_cli_connection_interface_contact_capabilities_call_update_capabilities
+tp_cli_connection_interface_contact_capabilities_signal_callback_contact_capabilities_changed
+tp_cli_connection_interface_contact_capabilities_connect_to_contact_capabilities_changed
+<SUBSECTION Private>
+tp_cli_connection_interface_contact_capabilities_run_get_contact_capabilities
+tp_cli_connection_interface_contact_capabilities_run_update_capabilities
 tp_cli_connection_interface_capabilities_run_advertise_capabilities
 tp_cli_connection_interface_capabilities_run_get_capabilities
+<SUBSECTION>
 tp_cli_connection_interface_capabilities_call_advertise_capabilities
 tp_cli_connection_interface_capabilities_call_get_capabilities
 tp_cli_connection_interface_capabilities_callback_for_advertise_capabilities
diff --git a/telepathy-glib/connection.xml b/telepathy-glib/connection.xml
index 0350314..273e8a2 100644
--- a/telepathy-glib/connection.xml
+++ b/telepathy-glib/connection.xml
@@ -9,6 +9,7 @@
 <xi:include href="../spec/Connection_Interface_Aliasing.xml"/>
 <xi:include href="../spec/Connection_Interface_Avatars.xml"/>
 <xi:include href="../spec/Connection_Interface_Capabilities.xml"/>
+<xi:include href="../spec/Connection_Interface_Contact_Capabilities.xml"/>
 <xi:include href="../spec/Connection_Interface_Simple_Presence.xml"/>
 <xi:include href="../spec/Connection_Interface_Presence.xml"/>
 <xi:include href="../spec/Connection_Interface_Contacts.xml"/>
diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h
index 3416fb9..e0b67c3 100644
--- a/telepathy-glib/extra-gtkdoc.h
+++ b/telepathy-glib/extra-gtkdoc.h
@@ -544,17 +544,21 @@
 
 /**
  * SECTION:connection-caps
- * @title: Connection Capabilities interface
- * @short_description: client-side wrappers for the Capabilities interface
+ * @title: Connection ContactCapabilities and Capabilities interfaces
+ * @short_description: client-side wrappers for the capabilities interfaces
  * @see_also: #TpConnection
  *
  * Some instant messaging protocols allow discovery of the capabilities of
- * a user's client. In Telepathy, this is represented by the Capabilities
- * interface, which lets applications advertise extra capabilities for the
- * local user, and query the interfaces supported by their contacts.
+ * a user's client. In Telepathy, this is represented by the
+ * ContactCapabilities interface, which lets applications advertise extra
+ * capabilities for the local user, and query the interfaces supported by
+ * their contacts.
+ *
+ * The Capabilities interface is an older API with similar functionality.
  *
  * This section documents the auto-generated C wrappers for the
- * Capabilities interface, used with #TpConnection objects.
+ * ContactCapabilities and Capabilities interfaces, used with
+ * #TpConnection objects.
  */
 
 /**
-- 
1.5.6.5