diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-05-10 15:37:10 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-05-10 15:37:10 +0100 |
| commit | 8e87e0eeabeefb59ac6f0869dda86320f035bdd7 (patch) | |
| tree | 73fd305ca414ff0825927f72f8b34979821407b5 /docs | |
| parent | 9e6ee0fc8a5f5e07aa006cfc832a469735484849 (diff) | |
| parent | 253b2ee2e1eb8ef631e7d0049907576e04acaa2e (diff) | |
| download | telepathy-glib-8e87e0eeabeefb59ac6f0869dda86320f035bdd7.tar.gz | |
Merge branch 'account-request-47100'
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/telepathy-glib-docs.sgml | 1 | ||||
| -rw-r--r-- | docs/reference/telepathy-glib-sections.txt | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml index 6e4d97d75..a59c1e20d 100644 --- a/docs/reference/telepathy-glib-docs.sgml +++ b/docs/reference/telepathy-glib-docs.sgml @@ -77,6 +77,7 @@ <xi:include href="xml/media-interfaces.xml"/> <xi:include href="xml/account-manager.xml"/> <xi:include href="xml/account.xml"/> + <xi:include href="xml/account-request.xml"/> <xi:include href="xml/channel-dispatcher.xml"/> <xi:include href="xml/channel-dispatch-operation.xml"/> <xi:include href="xml/channel-request.xml"/> diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index facbbb4fe..40256914c 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -5248,6 +5248,42 @@ TpAccountClassPrivate </SECTION> <SECTION> +<FILE>account-request</FILE> +<INCLUDE>telepathy-glib/account-request.h</INCLUDE> +<TITLE>account-request</TITLE> +TpAccountRequest +TpAccountRequestClass +tp_account_request_new +tp_account_request_new_from_protocol +<SUBSECTION> +tp_account_request_set_display_name +tp_account_request_set_icon_name +tp_account_request_set_nickname +tp_account_request_set_requested_presence +tp_account_request_set_automatic_presence +tp_account_request_set_enabled +tp_account_request_set_connect_automatically +tp_account_request_add_supersedes +tp_account_request_set_avatar +tp_account_request_set_service +<SUBSECTION> +tp_account_request_set_parameter +tp_account_request_set_parameter_string +<SUBSECTION> +tp_account_request_create_account_async +tp_account_request_create_account_finish +<SUBSECTION Standard> +TP_ACCOUNT_REQUEST +TP_IS_ACCOUNT_REQUEST +TP_IS_ACCOUNT_REQUEST_CLASS +TP_TYPE_ACCOUNT_REQUEST +tp_account_request_get_type +TP_ACCOUNT_REQUEST_CLASS +TP_ACCOUNT_REQUEST_GET_CLASS +TpAccountRequestPrivate +</SECTION> + +<SECTION> <FILE>account-manager</FILE> <INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> <TITLE>account-manager</TITLE> @@ -5976,6 +6012,7 @@ TpProtocol TpProtocolClass tp_protocol_new tp_protocol_get_name +tp_protocol_get_cm_name tp_protocol_init_known_interfaces <SUBSECTION> TP_PROTOCOL_FEATURE_PARAMETERS |