[next] telepathy-glib: Partially revert "Fix gtkdoc for recent spec changes "

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: a128b353c3929f44846995d02e926922177d35e0
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=a128b353c3929f44846995d02e926922177d35e0

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Sep 16 17:59:01 2013 +0100

Partially revert "Fix gtkdoc for recent spec changes"

This partially reverts commit 19999b5b46a537a0245057dfd99fe0728740001f.

---

 docs/reference/telepathy-glib-sections.txt |   31 ++++++++++++++++++----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 33169da..f80da69 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -993,10 +993,14 @@ tp_svc_connection_interface_avatars_return_from_clear_avatar
 tp_svc_connection_interface_avatars_set_avatar_impl
 tp_svc_connection_interface_avatars_implement_set_avatar
 tp_svc_connection_interface_avatars_return_from_set_avatar
-tp_svc_connection_interface_avatars_emit_avatars_updated
-tp_svc_connection_interface_avatars_implement_refresh_avatars
-tp_svc_connection_interface_avatars_refresh_avatars_impl
-tp_svc_connection_interface_avatars_return_from_refresh_avatars
+tp_svc_connection_interface_avatars_emit_avatar_updated
+tp_svc_connection_interface_avatars_emit_avatar_retrieved
+tp_svc_connection_interface_avatars_implement_request_avatars
+tp_svc_connection_interface_avatars_request_avatars_impl
+tp_svc_connection_interface_avatars_return_from_request_avatars
+tp_svc_connection_interface_avatars_get_known_avatar_tokens_impl
+tp_svc_connection_interface_avatars_implement_get_known_avatar_tokens
+tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens
 <SUBSECTION Standard>
 TP_SVC_CONNECTION_INTERFACE_AVATARS
 TP_IS_SVC_CONNECTION_INTERFACE_AVATARS
@@ -1314,7 +1318,6 @@ tp_unix_connection_send_credentials_with_byte_finish
 # Generic
 tp_dbus_specialized_value_slice_new
 TP_TYPE_UCHAR_ARRAY
-TP_HASH_TYPE_AVATAR_URI_MAP
 TP_ARRAY_TYPE_OBJECT_PATH_LIST
 TP_ARRAY_TYPE_UCHAR_ARRAY_LIST
 TP_HASH_TYPE_STRING_STRING_MAP
@@ -1341,6 +1344,9 @@ TP_HASH_TYPE_PROTOCOL_PROPERTIES_MAP
 # Connection - Aliasing
 TP_HASH_TYPE_ALIAS_MAP
 <SUBSECTION>
+# Connection - Avatars
+TP_HASH_TYPE_AVATAR_TOKEN_MAP
+<SUBSECTION>
 # Connection - Balance
 TP_STRUCT_TYPE_CURRENCY_AMOUNT
 <SUBSECTION>
@@ -2673,7 +2679,6 @@ TP_PROP_CONNECTION_INTERFACE_ALIASING_ALIAS_FLAGS
 TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY
 TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MODES
 TP_PROP_CONNECTION_INTERFACE_ANONYMITY_SUPPORTED_ANONYMITY_MODES
-TP_PROP_CONNECTION_INTERFACE_AVATARS_AVATAR_PERSISTS
 TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES
 TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT
 TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH
@@ -2744,7 +2749,7 @@ TP_TOKEN_CONNECTION_CONTACT_ID
 TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_ADDRESSES
 TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_URIS
 TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS
-TP_TOKEN_CONNECTION_INTERFACE_AVATARS_AVATAR
+TP_TOKEN_CONNECTION_INTERFACE_AVATARS_TOKEN
 TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES
 TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED
 TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES
@@ -3396,13 +3401,17 @@ tp_cli_connection_interface_aliasing_signal_callback_aliases_changed
 <TITLE>connection-avatars</TITLE>
 <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_avatars_call_clear_avatar
+tp_cli_connection_interface_avatars_call_get_known_avatar_tokens
+tp_cli_connection_interface_avatars_call_request_avatars
 tp_cli_connection_interface_avatars_call_set_avatar
 tp_cli_connection_interface_avatars_callback_for_clear_avatar
+tp_cli_connection_interface_avatars_callback_for_get_known_avatar_tokens
+tp_cli_connection_interface_avatars_callback_for_request_avatars
 tp_cli_connection_interface_avatars_callback_for_set_avatar
-tp_cli_connection_interface_avatars_call_refresh_avatars
-tp_cli_connection_interface_avatars_callback_for_refresh_avatars
-tp_cli_connection_interface_avatars_connect_to_avatars_updated
-tp_cli_connection_interface_avatars_signal_callback_avatars_updated
+tp_cli_connection_interface_avatars_connect_to_avatar_retrieved
+tp_cli_connection_interface_avatars_connect_to_avatar_updated
+tp_cli_connection_interface_avatars_signal_callback_avatar_retrieved
+tp_cli_connection_interface_avatars_signal_callback_avatar_updated
 </SECTION>
 
 <SECTION>