summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-15 13:22:19 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-28 14:30:53 +0100
commited4a1251f52abc801a4cbad5f9f464f51819a78b (patch)
tree41532fb3e62e487da32a6ec0d072161e57677bd4
parent4868017daf708049102ee33618a615f96f4adbc6 (diff)
Generate code for newly-stable interfaces
-rw-r--r--docs/reference/telepathy-glib-docs.sgml2
-rw-r--r--docs/reference/telepathy-glib-sections.txt67
-rw-r--r--telepathy-glib/channel-dispatcher.xml1
-rw-r--r--telepathy-glib/connection.xml2
-rw-r--r--telepathy-glib/extra-gtkdoc.h23
5 files changed, 95 insertions, 0 deletions
diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml
index fe4bb9090..8037ab9a2 100644
--- a/docs/reference/telepathy-glib-docs.sgml
+++ b/docs/reference/telepathy-glib-docs.sgml
@@ -57,6 +57,8 @@
<xi:include href="xml/connection-mail.xml"/>
<xi:include href="xml/connection-powersaving.xml"/>
<xi:include href="xml/connection-addressing.xml"/>
+ <xi:include href="xml/connection-renaming.xml"/>
+ <xi:include href="xml/connection-sidecars.xml"/>
<xi:include href="xml/contact-search.xml"/>
<xi:include href="xml/contact-search-result.xml"/>
<xi:include href="xml/channel.xml"/>
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index ad1fd64ed..fa640d4d4 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -1600,6 +1600,31 @@ TP_SVC_CONNECTION_INTERFACE_ADDRESSING
TP_SVC_CONNECTION_INTERFACE_ADDRESSING_GET_CLASS
TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRESSING
tp_svc_connection_interface_addressing_get_type
+<SUBSECTION>
+TpSvcConnectionInterfaceRenaming
+TpSvcConnectionInterfaceRenamingClass
+tp_svc_connection_interface_renaming_emit_renamed
+tp_svc_connection_interface_renaming_implement_request_rename
+tp_svc_connection_interface_renaming_request_rename_impl
+tp_svc_connection_interface_renaming_return_from_request_rename
+<SUBSECTION Standard>
+TP_IS_SVC_CONNECTION_INTERFACE_RENAMING
+TP_SVC_CONNECTION_INTERFACE_RENAMING
+TP_SVC_CONNECTION_INTERFACE_RENAMING_GET_CLASS
+TP_TYPE_SVC_CONNECTION_INTERFACE_RENAMING
+tp_svc_connection_interface_renaming_get_type
+<SUBSECTION>
+TpSvcConnectionInterfaceSidecars1
+TpSvcConnectionInterfaceSidecars1Class
+tp_svc_connection_interface_sidecars1_ensure_sidecar_impl
+tp_svc_connection_interface_sidecars1_implement_ensure_sidecar
+tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar
+<SUBSECTION Standard>
+TP_IS_SVC_CONNECTION_INTERFACE_SIDECARS1
+TP_SVC_CONNECTION_INTERFACE_SIDECARS1
+TP_SVC_CONNECTION_INTERFACE_SIDECARS1_GET_CLASS
+TP_TYPE_SVC_CONNECTION_INTERFACE_SIDECARS1
+tp_svc_connection_interface_sidecars1_get_type
</SECTION>
<SECTION>
@@ -3103,8 +3128,12 @@ TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST
TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST
TP_IFACE_CONNECTION_INTERFACE_CONTACTS
TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS
+TP_IFACE_CONNECTION_INTERFACE_RENAMING
+TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING
TP_IFACE_CONNECTION_INTERFACE_REQUESTS
TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS
+TP_IFACE_CONNECTION_INTERFACE_SIDECARS1
+TP_IFACE_QUARK_CONNECTION_INTERFACE_SIDECARS1
TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE
TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE
TP_IFACE_CONNECTION_INTERFACE_PRESENCE
@@ -3185,6 +3214,8 @@ TP_IFACE_CHANNEL_INTERFACE_SERVICE_POINT
TP_IFACE_QUARK_CHANNEL_INTERFACE_SERVICE_POINT
TP_IFACE_CHANNEL_DISPATCHER
TP_IFACE_QUARK_CHANNEL_DISPATCHER
+TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1
+TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1
TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
TP_IFACE_CHANNEL_DISPATCH_OPERATION
@@ -3447,6 +3478,7 @@ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION
+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILE_COLLECTION
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILE_COLLECTION
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET
@@ -3615,6 +3647,7 @@ tp_iface_quark_channel_type_dbus_tube
tp_iface_quark_channel_type_server_authentication
tp_iface_quark_channel_type_stream_tube
tp_iface_quark_channel_dispatcher
+tp_iface_quark_channel_dispatcher_interface_messages1
tp_iface_quark_channel_dispatcher_interface_operation_list
tp_iface_quark_channel_dispatch_operation
tp_iface_quark_channel_request
@@ -3637,8 +3670,10 @@ tp_iface_quark_connection_interface_contact_info
tp_iface_quark_connection_interface_contact_list
tp_iface_quark_connection_interface_capabilities
tp_iface_quark_connection_interface_mail_notification
+tp_iface_quark_connection_interface_renaming
tp_iface_quark_connection_interface_requests
tp_iface_quark_connection_interface_power_saving
+tp_iface_quark_connection_interface_sidecars1
tp_iface_quark_connection_interface_simple_presence
tp_iface_quark_connection_interface_presence
tp_iface_quark_connection_interface_location
@@ -4444,6 +4479,24 @@ tp_cli_connection_interface_aliasing_signal_callback_aliases_changed
</SECTION>
<SECTION>
+<FILE>connection-renaming</FILE>
+<TITLE>connection-renaming</TITLE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
+tp_cli_connection_interface_renaming_call_request_rename
+tp_cli_connection_interface_renaming_callback_for_request_rename
+tp_cli_connection_interface_renaming_connect_to_renamed
+tp_cli_connection_interface_renaming_signal_callback_renamed
+</SECTION>
+
+<SECTION>
+<FILE>connection-sidecars</FILE>
+<TITLE>connection-sidecars</TITLE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
+tp_cli_connection_interface_sidecars1_call_ensure_sidecar
+tp_cli_connection_interface_sidecars1_callback_for_ensure_sidecar
+</SECTION>
+
+<SECTION>
<FILE>connection-avatars</FILE>
<TITLE>connection-avatars</TITLE>
<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
@@ -5413,6 +5466,9 @@ tp_cli_channel_dispatcher_call_present_channel
tp_cli_channel_dispatcher_callback_for_delegate_channels
tp_cli_channel_dispatcher_callback_for_present_channel
<SUBSECTION>
+tp_cli_channel_dispatcher_interface_messages1_call_send_message
+tp_cli_channel_dispatcher_interface_messages1_callback_for_send_message
+<SUBSECTION>
tp_cli_channel_dispatcher_interface_operation_list_signal_callback_dispatch_operation_finished
tp_cli_channel_dispatcher_interface_operation_list_connect_to_dispatch_operation_finished
tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_dispatch_operation
@@ -5458,16 +5514,27 @@ TpSvcChannelDispatcherInterfaceOperationList
TpSvcChannelDispatcherInterfaceOperationListClass
tp_svc_channel_dispatcher_interface_operation_list_emit_new_dispatch_operation
tp_svc_channel_dispatcher_interface_operation_list_emit_dispatch_operation_finished
+<SUBSECTION>
+TpSvcChannelDispatcherInterfaceMessages1
+TpSvcChannelDispatcherInterfaceMessages1Class
+tp_svc_channel_dispatcher_interface_messages1_implement_send_message
+tp_svc_channel_dispatcher_interface_messages1_return_from_send_message
+tp_svc_channel_dispatcher_interface_messages1_send_message_impl
<SUBSECTION Standard>
TP_SVC_CHANNEL_DISPATCHER
+TP_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1
TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
TP_IS_SVC_CHANNEL_DISPATCHER
+TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1
TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
TP_TYPE_SVC_CHANNEL_DISPATCHER
+TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1
TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
tp_svc_channel_dispatcher_get_type
+tp_svc_channel_dispatcher_interface_messages1_get_type
tp_svc_channel_dispatcher_interface_operation_list_get_type
TP_SVC_CHANNEL_DISPATCHER_GET_CLASS
+TP_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1_GET_CLASS
TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_GET_CLASS
</SECTION>
diff --git a/telepathy-glib/channel-dispatcher.xml b/telepathy-glib/channel-dispatcher.xml
index 82d6d63f6..265c1c799 100644
--- a/telepathy-glib/channel-dispatcher.xml
+++ b/telepathy-glib/channel-dispatcher.xml
@@ -5,6 +5,7 @@
<tp:title>Channel Dispatcher interfaces</tp:title>
<xi:include href="../spec/Channel_Dispatcher.xml"/>
+<xi:include href="../spec/Channel_Dispatcher_Interface_Messages1.xml"/>
<xi:include href="../spec/Channel_Dispatcher_Interface_Operation_List.xml"/>
</tp:spec>
diff --git a/telepathy-glib/connection.xml b/telepathy-glib/connection.xml
index c72fcb8af..95fceea43 100644
--- a/telepathy-glib/connection.xml
+++ b/telepathy-glib/connection.xml
@@ -19,6 +19,8 @@
<xi:include href="../spec/Connection_Interface_Contact_Groups.xml"/>
<xi:include href="../spec/Connection_Interface_Contact_Info.xml"/>
<xi:include href="../spec/Connection_Interface_Contact_List.xml"/>
+<xi:include href="../spec/Connection_Interface_Renaming.xml"/>
+<xi:include href="../spec/Connection_Interface_Sidecars1.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 b1e5860b0..47b94a94e 100644
--- a/telepathy-glib/extra-gtkdoc.h
+++ b/telepathy-glib/extra-gtkdoc.h
@@ -1198,3 +1198,26 @@
*
* Since: 0.17.5
*/
+
+/**
+ * SECTION:connection-renaming
+ * @title: Connection Renaming interface
+ * @short_description: client-side wrappers for the Renaming interface
+ * @see_also: #TpConnection
+ *
+ * In IRC, and perhaps other protocols, users' unique identifiers can change.
+ * The Renaming interface models this.
+ */
+
+/**
+ * SECTION:connection-sidecars
+ * @title: Connection Sidecars interface
+ * @short_description: client-side wrappers for the Sidecars interface
+ * @see_also: #TpConnection
+ *
+ * Some Telepathy connection managers have a plugin API, with plugins
+ * providing plugin-specific channel types and other D-Bus APIs. It is
+ * technically difficult for plugins to add interfaces analogous to Aliasing,
+ * Avatars etc. to a Connection. The Sidecars1 interface provides an
+ * alternative, by attaching plugin-provided interfaces to a secondary object.
+ */