Attachment 87462 Details for Bug 70377 – [tp-glib next] Don't strip ABI versions from generated code

[patch] [tp-glib next] Don't strip ABI versions from generated code

0001-Don-t-strip-ABI-versions-from-generated-code.patch (text/plain), 558.08 KB, created by Simon McVittie on 2013-10-11 15:54:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-10-11 15:54:22 UTC

Size: 558.08 KB

patch

obsolete

>From 80e0fc94fbf2eb9b22b7776ebc916163d58b3704 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 11 Oct 2013 16:06:31 +0100
>Subject: [PATCH] Don't strip ABI versions from generated code
>
>---
> docs/reference/telepathy-glib-sections.txt      | 3510 +++++++++++------------
> examples/client/approver.c                      |    2 +-
> examples/client/dbus-tubes/accepter.c           |    4 +-
> examples/client/dbus-tubes/offerer.c            |    4 +-
> examples/client/inspect-channel.c               |    2 +-
> examples/client/stream-tubes/accepter.c         |    4 +-
> examples/client/stream-tubes/offerer.c          |    4 +-
> examples/cm/call/call-channel.c                 |   26 +-
> examples/cm/call/call-manager.c                 |   22 +-
> examples/cm/call/conn.c                         |    4 +-
> examples/cm/channelspecific/room.c              |    4 +-
> examples/cm/contactlist/conn.c                  |   40 +-
> examples/cm/echo-message-parts/chan.c           |   38 +-
> examples/cm/echo-message-parts/protocol.c       |    4 +-
> telepathy-glib/account-channel-request.c        |   28 +-
> telepathy-glib/account-request.c                |   10 +-
> telepathy-glib/account.c                        |   14 +-
> telepathy-glib/automatic-client-factory.c       |    8 +-
> telepathy-glib/base-call-channel.c              |   74 +-
> telepathy-glib/base-call-content.c              |   46 +-
> telepathy-glib/base-call-stream.c               |   32 +-
> telepathy-glib/base-contact-list.c              |  146 +-
> telepathy-glib/base-media-call-channel.c        |   21 +-
> telepathy-glib/base-media-call-content.c        |   57 +-
> telepathy-glib/base-media-call-stream.c         |   75 +-
> telepathy-glib/base-password-channel.c          |   46 +-
> telepathy-glib/base-protocol.c                  |   56 +-
> telepathy-glib/base-room-config.c               |   16 +-
> telepathy-glib/call-channel.c                   |   46 +-
> telepathy-glib/call-content-media-description.c |   51 +-
> telepathy-glib/call-content.c                   |   20 +-
> telepathy-glib/call-stream-endpoint.c           |   46 +-
> telepathy-glib/call-stream.c                    |   12 +-
> telepathy-glib/capabilities.c                   |   42 +-
> telepathy-glib/channel-group.c                  |   12 +-
> telepathy-glib/channel.c                        |   16 +-
> telepathy-glib/connection-aliasing.c            |    2 +-
> telepathy-glib/connection-avatars.c             |    2 +-
> telepathy-glib/connection-contact-info.c        |    4 +-
> telepathy-glib/connection-contact-list.c        |   54 +-
> telepathy-glib/connection.c                     |   18 +-
> telepathy-glib/contact-operations.c             |    8 +-
> telepathy-glib/contact-search.c                 |   18 +-
> telepathy-glib/contact.c                        |  106 +-
> telepathy-glib/dbus-tube-channel.c              |   20 +-
> telepathy-glib/debug-client.c                   |   10 +-
> telepathy-glib/debug-sender.c                   |   14 +-
> telepathy-glib/file-transfer-channel.c          |   68 +-
> telepathy-glib/group-mixin.c                    |   62 +-
> telepathy-glib/message-mixin.c                  |   20 +-
> telepathy-glib/presence-mixin.c                 |   22 +-
> telepathy-glib/protocol.c                       |   34 +-
> telepathy-glib/room-list.c                      |   12 +-
> telepathy-glib/stream-tube-channel.c            |   22 +-
> telepathy-glib/text-channel.c                   |   18 +-
> tests/capabilities.c                            |   52 +-
> tests/dbus/account-channel-request.c            |   34 +-
> tests/dbus/account-request.c                    |    6 +-
> tests/dbus/base-client.c                        |   10 +-
> tests/dbus/call-channel.c                       |   24 +-
> tests/dbus/channel-introspect.c                 |    6 +-
> tests/dbus/channel.c                            |    2 +-
> tests/dbus/connection-balance.c                 |    8 +-
> tests/dbus/connection-interests.c               |   26 +-
> tests/dbus/contact-lists.c                      |  128 +-
> tests/dbus/contacts-mixin.c                     |   18 +-
> tests/dbus/contacts.c                           |    2 +-
> tests/dbus/group-mixin.c                        |    6 +-
> tests/dbus/message-mixin.c                      |    2 +-
> tests/dbus/protocol-objects.c                   |   10 +-
> tests/dbus/room-list.c                          |    2 +-
> tests/dbus/self-presence.c                      |   16 +-
> tests/dbus/simple-approver.c                    |    4 +-
> tests/dbus/simple-handler.c                     |    4 +-
> tests/dbus/simple-observer.c                    |    4 +-
> tests/dbus/text-respawn.c                       |    2 +-
> tests/dbus/unsupported-interface.c              |    6 +-
> tests/lib/broken-client-types-conn.c            |    4 +-
> tests/lib/contacts-conn.c                       |  116 +-
> tests/lib/dbus-tube-chan.c                      |   32 +-
> tests/lib/echo-chan.c                           |   12 +-
> tests/lib/file-transfer-chan.c                  |   42 +-
> tests/lib/room-list-chan.c                      |   22 +-
> tests/lib/simple-account.c                      |   18 +-
> tests/lib/simple-channel-request.c              |    4 +-
> tests/lib/stream-tube-chan.c                    |   38 +-
> tests/lib/textchan-group.c                      |   24 +-
> tools/glib-client-gen.py                        |    6 -
> tools/glib-ginterface-gen.py                    |    3 -
> tools/glib-interfaces-gen.py                    |   26 +-
> 90 files changed, 2881 insertions(+), 2894 deletions(-)
>
>diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
>index a9a1c82..31431c0 100644
>--- a/docs/reference/telepathy-glib-sections.txt
>+++ b/docs/reference/telepathy-glib-sections.txt
>@@ -328,22 +328,22 @@ tp_svc_channel_implement_close
> tp_svc_channel_return_from_close
> tp_svc_channel_emit_closed
> <SUBSECTION>
>-TpSvcChannelInterfaceDestroyable
>-TpSvcChannelInterfaceDestroyableClass
>-tp_svc_channel_interface_destroyable_destroy_impl
>-tp_svc_channel_interface_destroyable_implement_destroy
>-tp_svc_channel_interface_destroyable_return_from_destroy
>+TpSvcChannelInterfaceDestroyable1
>+TpSvcChannelInterfaceDestroyable1Class
>+tp_svc_channel_interface_destroyable1_destroy_impl
>+tp_svc_channel_interface_destroyable1_implement_destroy
>+tp_svc_channel_interface_destroyable1_return_from_destroy
> <SUBSECTION Standard>
> TP_SVC_CHANNEL
> TP_IS_SVC_CHANNEL
> TP_TYPE_SVC_CHANNEL
> tp_svc_channel_get_type
> TP_SVC_CHANNEL_GET_CLASS
>-TP_IS_SVC_CHANNEL_INTERFACE_DESTROYABLE
>-TP_SVC_CHANNEL_INTERFACE_DESTROYABLE
>-TP_SVC_CHANNEL_INTERFACE_DESTROYABLE_GET_CLASS
>-tp_svc_channel_interface_destroyable_get_type
>-TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE
>+TP_IS_SVC_CHANNEL_INTERFACE_DESTROYABLE1
>+TP_SVC_CHANNEL_INTERFACE_DESTROYABLE1
>+TP_SVC_CHANNEL_INTERFACE_DESTROYABLE1_GET_CLASS
>+tp_svc_channel_interface_destroyable1_get_type
>+TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1
> </SECTION>
> 
> <SECTION>
>@@ -368,47 +368,47 @@ TP_TYPE_SVC_CHANNEL_TYPE_TEXT
> tp_svc_channel_type_text_get_type
> TP_SVC_CHANNEL_TYPE_TEXT_GET_CLASS
> <SUBSECTION>
>-TpSvcChannelInterfaceChatState
>-TpSvcChannelInterfaceChatStateClass
>-tp_svc_channel_interface_chat_state_set_chat_state_impl
>-tp_svc_channel_interface_chat_state_implement_set_chat_state
>-tp_svc_channel_interface_chat_state_return_from_set_chat_state
>-tp_svc_channel_interface_chat_state_emit_chat_state_changed
>-<SUBSECTION Standard>
>-TP_SVC_CHANNEL_INTERFACE_CHAT_STATE
>-TP_IS_SVC_CHANNEL_INTERFACE_CHAT_STATE
>-TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE
>-tp_svc_channel_interface_chat_state_get_type
>-TP_SVC_CHANNEL_INTERFACE_CHAT_STATE_GET_CLASS
>-<SUBSECTION>
>-TpSvcChannelInterfacePassword
>-TpSvcChannelInterfacePasswordClass
>-tp_svc_channel_interface_password_get_password_flags_impl
>-tp_svc_channel_interface_password_implement_get_password_flags
>-tp_svc_channel_interface_password_return_from_get_password_flags
>-tp_svc_channel_interface_password_provide_password_impl
>-tp_svc_channel_interface_password_implement_provide_password
>-tp_svc_channel_interface_password_return_from_provide_password
>-tp_svc_channel_interface_password_emit_password_flags_changed
>-<SUBSECTION Standard>
>-TP_SVC_CHANNEL_INTERFACE_PASSWORD
>-TP_IS_SVC_CHANNEL_INTERFACE_PASSWORD
>-TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD
>-tp_svc_channel_interface_password_get_type
>-TP_SVC_CHANNEL_INTERFACE_PASSWORD_GET_CLASS
>-<SUBSECTION>
>-TpSvcChannelInterfaceSMS
>-TpSvcChannelInterfaceSMSClass
>-tp_svc_channel_interface_sms_emit_sms_channel_changed
>-tp_svc_channel_interface_sms_get_sms_length_impl
>-tp_svc_channel_interface_sms_implement_get_sms_length
>-tp_svc_channel_interface_sms_return_from_get_sms_length
>-<SUBSECTION Standard>
>-tp_svc_channel_interface_sms_get_type
>-TP_TYPE_SVC_CHANNEL_INTERFACE_SMS
>-TP_SVC_CHANNEL_INTERFACE_SMS_GET_CLASS
>-TP_SVC_CHANNEL_INTERFACE_SMS
>-TP_IS_SVC_CHANNEL_INTERFACE_SMS
>+TpSvcChannelInterfaceChatState1
>+TpSvcChannelInterfaceChatState1Class
>+tp_svc_channel_interface_chat_state1_set_chat_state_impl
>+tp_svc_channel_interface_chat_state1_implement_set_chat_state
>+tp_svc_channel_interface_chat_state1_return_from_set_chat_state
>+tp_svc_channel_interface_chat_state1_emit_chat_state_changed
>+<SUBSECTION Standard>
>+TP_SVC_CHANNEL_INTERFACE_CHAT_STATE1
>+TP_IS_SVC_CHANNEL_INTERFACE_CHAT_STATE1
>+TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE1
>+tp_svc_channel_interface_chat_state1_get_type
>+TP_SVC_CHANNEL_INTERFACE_CHAT_STATE1_GET_CLASS
>+<SUBSECTION>
>+TpSvcChannelInterfacePassword1
>+TpSvcChannelInterfacePassword1Class
>+tp_svc_channel_interface_password1_get_password_flags_impl
>+tp_svc_channel_interface_password1_implement_get_password_flags
>+tp_svc_channel_interface_password1_return_from_get_password_flags
>+tp_svc_channel_interface_password1_provide_password_impl
>+tp_svc_channel_interface_password1_implement_provide_password
>+tp_svc_channel_interface_password1_return_from_provide_password
>+tp_svc_channel_interface_password1_emit_password_flags_changed
>+<SUBSECTION Standard>
>+TP_SVC_CHANNEL_INTERFACE_PASSWORD1
>+TP_IS_SVC_CHANNEL_INTERFACE_PASSWORD1
>+TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD1
>+tp_svc_channel_interface_password1_get_type
>+TP_SVC_CHANNEL_INTERFACE_PASSWORD1_GET_CLASS
>+<SUBSECTION>
>+TpSvcChannelInterfaceSMS1
>+TpSvcChannelInterfaceSMS1Class
>+tp_svc_channel_interface_sms1_emit_sms_channel_changed
>+tp_svc_channel_interface_sms1_get_sms_length_impl
>+tp_svc_channel_interface_sms1_implement_get_sms_length
>+tp_svc_channel_interface_sms1_return_from_get_sms_length
>+<SUBSECTION Standard>
>+tp_svc_channel_interface_sms1_get_type
>+TP_TYPE_SVC_CHANNEL_INTERFACE_SMS1
>+TP_SVC_CHANNEL_INTERFACE_SMS1_GET_CLASS
>+TP_SVC_CHANNEL_INTERFACE_SMS1
>+TP_IS_SVC_CHANNEL_INTERFACE_SMS1
> </SECTION>
> 
> <SECTION>
>@@ -416,501 +416,501 @@ TP_IS_SVC_CHANNEL_INTERFACE_SMS
> <TITLE>svc-channel-room</TITLE>
> <FILE>svc-channel-room</FILE>
> <SUBSECTION>
>-TpSvcChannelInterfaceRoom
>-TpSvcChannelInterfaceRoomClass
>+TpSvcChannelInterfaceRoom1
>+TpSvcChannelInterfaceRoom1Class
> <SUBSECTION Standard>
>-tp_svc_channel_interface_room_get_type
>-TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM
>-TP_SVC_CHANNEL_INTERFACE_ROOM
>-TP_SVC_CHANNEL_INTERFACE_ROOM_GET_CLASS
>-TP_IS_SVC_CHANNEL_INTERFACE_ROOM
>+tp_svc_channel_interface_room1_get_type
>+TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM1
>+TP_SVC_CHANNEL_INTERFACE_ROOM1
>+TP_SVC_CHANNEL_INTERFACE_ROOM1_GET_CLASS
>+TP_IS_SVC_CHANNEL_INTERFACE_ROOM1
> <SUBSECTION>
>-TpSvcChannelInterfaceRoomConfig
>-TpSvcChannelInterfaceRoomConfigClass
>-tp_svc_channel_interface_room_config_implement_update_configuration
>-tp_svc_channel_interface_room_config_return_from_update_configuration
>-tp_svc_channel_interface_room_config_update_configuration_impl
>+TpSvcChannelInterfaceRoomConfig1
>+TpSvcChannelInterfaceRoomConfig1Class
>+tp_svc_channel_interface_room_config1_implement_update_configuration
>+tp_svc_channel_interface_room_config1_return_from_update_configuration
>+tp_svc_channel_interface_room_config1_update_configuration_impl
> <SUBSECTION Standard>
>-tp_svc_channel_interface_room_config_get_type
>-TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG
>-TP_SVC_CHANNEL_INTERFACE_ROOM_CONFIG
>-TP_SVC_CHANNEL_INTERFACE_ROOM_CONFIG_GET_CLASS
>-TP_IS_SVC_CHANNEL_INTERFACE_ROOM_CONFIG
>+tp_svc_channel_interface_room_config1_get_type
>+TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1
>+TP_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1
>+TP_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1_GET_CLASS
>+TP_IS_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1
> <SUBSECTION>
>-TpSvcChannelInterfaceSubject
>-TpSvcChannelInterfaceSubjectClass
>-tp_svc_channel_interface_subject_implement_set_subject
>-tp_svc_channel_interface_subject_return_from_set_subject
>-tp_svc_channel_interface_subject_set_subject_impl
>+TpSvcChannelInterfaceSubject1
>+TpSvcChannelInterfaceSubject1Class
>+tp_svc_channel_interface_subject1_implement_set_subject
>+tp_svc_channel_interface_subject1_return_from_set_subject
>+tp_svc_channel_interface_subject1_set_subject_impl
> <SUBSECTION Standard>
>-tp_svc_channel_interface_subject_get_type
>-TP_TYPE_SVC_CHANNEL_INTERFACE_SUBJECT
>-TP_SVC_CHANNEL_INTERFACE_SUBJECT
>-TP_SVC_CHANNEL_INTERFACE_SUBJECT_GET_CLASS
>-TP_IS_SVC_CHANNEL_INTERFACE_SUBJECT
>+tp_svc_channel_interface_subject1_get_type
>+TP_TYPE_SVC_CHANNEL_INTERFACE_SUBJECT1
>+TP_SVC_CHANNEL_INTERFACE_SUBJECT1
>+TP_SVC_CHANNEL_INTERFACE_SUBJECT1_GET_CLASS
>+TP_IS_SVC_CHANNEL_INTERFACE_SUBJECT1
> </SECTION>
> 
> <SECTION>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <TITLE>svc-channel-file-transfer</TITLE>
> <FILE>svc-channel-file-transfer</FILE>
>-TpSvcChannelTypeFileTransfer
>-TpSvcChannelTypeFileTransferClass
>-tp_svc_channel_type_file_transfer_accept_file_impl
>-tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed
>-tp_svc_channel_type_file_transfer_emit_initial_offset_defined
>-tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed
>-tp_svc_channel_type_file_transfer_emit_uri_defined
>-tp_svc_channel_type_file_transfer_implement_accept_file
>-tp_svc_channel_type_file_transfer_implement_provide_file
>-tp_svc_channel_type_file_transfer_provide_file_impl
>-tp_svc_channel_type_file_transfer_return_from_accept_file
>-tp_svc_channel_type_file_transfer_return_from_provide_file
>-<SUBSECTION Standard>
>-TP_SVC_CHANNEL_TYPE_FILE_TRANSFER
>-TP_IS_SVC_CHANNEL_TYPE_FILE_TRANSFER
>-TP_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER
>-tp_svc_channel_type_file_transfer_get_type
>-TP_SVC_CHANNEL_TYPE_FILE_TRANSFER_GET_CLASS
>+TpSvcChannelTypeFileTransfer1
>+TpSvcChannelTypeFileTransfer1Class
>+tp_svc_channel_type_file_transfer1_accept_file_impl
>+tp_svc_channel_type_file_transfer1_emit_file_transfer_state_changed
>+tp_svc_channel_type_file_transfer1_emit_initial_offset_defined
>+tp_svc_channel_type_file_transfer1_emit_transferred_bytes_changed
>+tp_svc_channel_type_file_transfer1_emit_uri_defined
>+tp_svc_channel_type_file_transfer1_implement_accept_file
>+tp_svc_channel_type_file_transfer1_implement_provide_file
>+tp_svc_channel_type_file_transfer1_provide_file_impl
>+tp_svc_channel_type_file_transfer1_return_from_accept_file
>+tp_svc_channel_type_file_transfer1_return_from_provide_file
>+<SUBSECTION Standard>
>+TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1
>+TP_IS_SVC_CHANNEL_TYPE_FILE_TRANSFER1
>+TP_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER1
>+tp_svc_channel_type_file_transfer1_get_type
>+TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1_GET_CLASS
> </SECTION>
> 
> <SECTION>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <TITLE>svc-channel-tube</TITLE>
> <FILE>svc-channel-tube</FILE>
>-TpSvcChannelInterfaceTube
>-TpSvcChannelInterfaceTubeClass
>-tp_svc_channel_interface_tube_emit_tube_channel_state_changed
>-TpSvcChannelTypeStreamTube
>-TpSvcChannelTypeStreamTubeClass
>-tp_svc_channel_type_stream_tube_offer_impl
>-tp_svc_channel_type_stream_tube_implement_offer
>-tp_svc_channel_type_stream_tube_return_from_offer
>-tp_svc_channel_type_stream_tube_accept_impl
>-tp_svc_channel_type_stream_tube_implement_accept
>-tp_svc_channel_type_stream_tube_return_from_accept
>-tp_svc_channel_type_stream_tube_emit_new_remote_connection
>-tp_svc_channel_type_stream_tube_emit_new_local_connection
>-tp_svc_channel_type_stream_tube_emit_connection_closed
>-TpSvcChannelTypeDBusTube
>-TpSvcChannelTypeDBusTubeClass
>-tp_svc_channel_type_dbus_tube_offer_impl
>-tp_svc_channel_type_dbus_tube_implement_offer
>-tp_svc_channel_type_dbus_tube_return_from_offer
>-tp_svc_channel_type_dbus_tube_accept_impl
>-tp_svc_channel_type_dbus_tube_implement_accept
>-tp_svc_channel_type_dbus_tube_return_from_accept
>-tp_svc_channel_type_dbus_tube_emit_dbus_names_changed
>-<SUBSECTION Standard>
>-TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE
>-TP_SVC_CHANNEL_INTERFACE_TUBE
>-TP_IS_SVC_CHANNEL_INTERFACE_TUBE
>-tp_svc_channel_interface_tube_get_type
>-TP_SVC_CHANNEL_INTERFACE_TUBE_GET_CLASS
>-TP_SVC_CHANNEL_TYPE_STREAM_TUBE
>-TP_IS_SVC_CHANNEL_TYPE_STREAM_TUBE
>-TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE
>-tp_svc_channel_type_stream_tube_get_type
>-TP_SVC_CHANNEL_TYPE_STREAM_TUBE_GET_CLASS
>-TP_SVC_CHANNEL_TYPE_DBUS_TUBE
>-TP_IS_SVC_CHANNEL_TYPE_DBUS_TUBE
>-TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE
>-tp_svc_channel_type_dbus_tube_get_type
>-TP_SVC_CHANNEL_TYPE_DBUS_TUBE_GET_CLASS
>+TpSvcChannelInterfaceTube1
>+TpSvcChannelInterfaceTube1Class
>+tp_svc_channel_interface_tube1_emit_tube_channel_state_changed
>+TpSvcChannelTypeStreamTube1
>+TpSvcChannelTypeStreamTube1Class
>+tp_svc_channel_type_stream_tube1_offer_impl
>+tp_svc_channel_type_stream_tube1_implement_offer
>+tp_svc_channel_type_stream_tube1_return_from_offer
>+tp_svc_channel_type_stream_tube1_accept_impl
>+tp_svc_channel_type_stream_tube1_implement_accept
>+tp_svc_channel_type_stream_tube1_return_from_accept
>+tp_svc_channel_type_stream_tube1_emit_new_remote_connection
>+tp_svc_channel_type_stream_tube1_emit_new_local_connection
>+tp_svc_channel_type_stream_tube1_emit_connection_closed
>+TpSvcChannelTypeDBusTube1
>+TpSvcChannelTypeDBusTube1Class
>+tp_svc_channel_type_dbus_tube1_offer_impl
>+tp_svc_channel_type_dbus_tube1_implement_offer
>+tp_svc_channel_type_dbus_tube1_return_from_offer
>+tp_svc_channel_type_dbus_tube1_accept_impl
>+tp_svc_channel_type_dbus_tube1_implement_accept
>+tp_svc_channel_type_dbus_tube1_return_from_accept
>+tp_svc_channel_type_dbus_tube1_emit_dbus_names_changed
>+<SUBSECTION Standard>
>+TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE1
>+TP_SVC_CHANNEL_INTERFACE_TUBE1
>+TP_IS_SVC_CHANNEL_INTERFACE_TUBE1
>+tp_svc_channel_interface_tube1_get_type
>+TP_SVC_CHANNEL_INTERFACE_TUBE1_GET_CLASS
>+TP_SVC_CHANNEL_TYPE_STREAM_TUBE1
>+TP_IS_SVC_CHANNEL_TYPE_STREAM_TUBE1
>+TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE1
>+tp_svc_channel_type_stream_tube1_get_type
>+TP_SVC_CHANNEL_TYPE_STREAM_TUBE1_GET_CLASS
>+TP_SVC_CHANNEL_TYPE_DBUS_TUBE1
>+TP_IS_SVC_CHANNEL_TYPE_DBUS_TUBE1
>+TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE1
>+tp_svc_channel_type_dbus_tube1_get_type
>+TP_SVC_CHANNEL_TYPE_DBUS_TUBE1_GET_CLASS
> </SECTION>
> 
> <SECTION>
> <FILE>svc-channel-roomlist</FILE>
> <TITLE>svc-channel-roomlist</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelTypeRoomList
>-TpSvcChannelTypeRoomListClass
>-tp_svc_channel_type_room_list_get_listing_rooms_impl
>-tp_svc_channel_type_room_list_implement_get_listing_rooms
>-tp_svc_channel_type_room_list_return_from_get_listing_rooms
>-tp_svc_channel_type_room_list_list_rooms_impl
>-tp_svc_channel_type_room_list_implement_list_rooms
>-tp_svc_channel_type_room_list_return_from_list_rooms
>-tp_svc_channel_type_room_list_stop_listing_impl
>-tp_svc_channel_type_room_list_implement_stop_listing
>-tp_svc_channel_type_room_list_return_from_stop_listing
>-tp_svc_channel_type_room_list_emit_got_rooms
>-tp_svc_channel_type_room_list_emit_listing_rooms
>-<SUBSECTION Standard>
>-TP_SVC_CHANNEL_TYPE_ROOM_LIST
>-TP_IS_SVC_CHANNEL_TYPE_ROOM_LIST
>-TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST
>-tp_svc_channel_type_room_list_get_type
>-TP_SVC_CHANNEL_TYPE_ROOM_LIST_GET_CLASS
>+TpSvcChannelTypeRoomList1
>+TpSvcChannelTypeRoomList1Class
>+tp_svc_channel_type_room_list1_get_listing_rooms_impl
>+tp_svc_channel_type_room_list1_implement_get_listing_rooms
>+tp_svc_channel_type_room_list1_return_from_get_listing_rooms
>+tp_svc_channel_type_room_list1_list_rooms_impl
>+tp_svc_channel_type_room_list1_implement_list_rooms
>+tp_svc_channel_type_room_list1_return_from_list_rooms
>+tp_svc_channel_type_room_list1_stop_listing_impl
>+tp_svc_channel_type_room_list1_implement_stop_listing
>+tp_svc_channel_type_room_list1_return_from_stop_listing
>+tp_svc_channel_type_room_list1_emit_got_rooms
>+tp_svc_channel_type_room_list1_emit_listing_rooms
>+<SUBSECTION Standard>
>+TP_SVC_CHANNEL_TYPE_ROOM_LIST1
>+TP_IS_SVC_CHANNEL_TYPE_ROOM_LIST1
>+TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST1
>+tp_svc_channel_type_room_list1_get_type
>+TP_SVC_CHANNEL_TYPE_ROOM_LIST1_GET_CLASS
> </SECTION>
> 
> <SECTION>
> <FILE>svc-channel-group</FILE>
> <TITLE>svc-channel-group</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelInterfaceGroup
>-TpSvcChannelInterfaceGroupClass
>-tp_svc_channel_interface_group_add_members_impl
>-tp_svc_channel_interface_group_implement_add_members
>-tp_svc_channel_interface_group_return_from_add_members
>-tp_svc_channel_interface_group_remove_members_impl
>-tp_svc_channel_interface_group_implement_remove_members
>-tp_svc_channel_interface_group_return_from_remove_members
>-tp_svc_channel_interface_group_emit_group_flags_changed
>-tp_svc_channel_interface_group_emit_members_changed
>-tp_svc_channel_interface_group_emit_handle_owners_changed
>-<SUBSECTION Standard>
>-TP_SVC_CHANNEL_INTERFACE_GROUP
>-TP_IS_SVC_CHANNEL_INTERFACE_GROUP
>-TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP
>-tp_svc_channel_interface_group_get_type
>-TP_SVC_CHANNEL_INTERFACE_GROUP_GET_CLASS
>-<SUBSECTION>
>-TpSvcChannelInterfaceConference
>-TpSvcChannelInterfaceConferenceClass
>-tp_svc_channel_interface_conference_emit_channel_merged
>-tp_svc_channel_interface_conference_emit_channel_removed
>-<SUBSECTION Standard>
>-TP_IS_SVC_CHANNEL_INTERFACE_CONFERENCE
>-TP_SVC_CHANNEL_INTERFACE_CONFERENCE
>-TP_SVC_CHANNEL_INTERFACE_CONFERENCE_GET_CLASS
>-TP_TYPE_SVC_CHANNEL_INTERFACE_CONFERENCE
>-tp_svc_channel_interface_conference_get_type
>+TpSvcChannelInterfaceGroup1
>+TpSvcChannelInterfaceGroup1Class
>+tp_svc_channel_interface_group1_add_members_impl
>+tp_svc_channel_interface_group1_implement_add_members
>+tp_svc_channel_interface_group1_return_from_add_members
>+tp_svc_channel_interface_group1_remove_members_impl
>+tp_svc_channel_interface_group1_implement_remove_members
>+tp_svc_channel_interface_group1_return_from_remove_members
>+tp_svc_channel_interface_group1_emit_group_flags_changed
>+tp_svc_channel_interface_group1_emit_members_changed
>+tp_svc_channel_interface_group1_emit_handle_owners_changed
>+<SUBSECTION Standard>
>+TP_SVC_CHANNEL_INTERFACE_GROUP1
>+TP_IS_SVC_CHANNEL_INTERFACE_GROUP1
>+TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1
>+tp_svc_channel_interface_group1_get_type
>+TP_SVC_CHANNEL_INTERFACE_GROUP1_GET_CLASS
>+<SUBSECTION>
>+TpSvcChannelInterfaceConference1
>+TpSvcChannelInterfaceConference1Class
>+tp_svc_channel_interface_conference1_emit_channel_merged
>+tp_svc_channel_interface_conference1_emit_channel_removed
>+<SUBSECTION Standard>
>+TP_IS_SVC_CHANNEL_INTERFACE_CONFERENCE1
>+TP_SVC_CHANNEL_INTERFACE_CONFERENCE1
>+TP_SVC_CHANNEL_INTERFACE_CONFERENCE1_GET_CLASS
>+TP_TYPE_SVC_CHANNEL_INTERFACE_CONFERENCE1
>+tp_svc_channel_interface_conference1_get_type
> </SECTION>
> 
> <SECTION>
> <FILE>svc-channel-call</FILE>
> <TITLE>svc-channel-call</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelTypeCall
>-TpSvcChannelTypeCallClass
>-tp_svc_channel_type_call_accept_impl
>-tp_svc_channel_type_call_add_content_impl
>-tp_svc_channel_type_call_emit_call_members_changed
>-tp_svc_channel_type_call_emit_call_state_changed
>-tp_svc_channel_type_call_emit_content_added
>-tp_svc_channel_type_call_emit_content_removed
>-tp_svc_channel_type_call_hangup_impl
>-tp_svc_channel_type_call_implement_accept
>-tp_svc_channel_type_call_implement_add_content
>-tp_svc_channel_type_call_implement_hangup
>-tp_svc_channel_type_call_implement_set_queued
>-tp_svc_channel_type_call_implement_set_ringing
>-tp_svc_channel_type_call_return_from_accept
>-tp_svc_channel_type_call_return_from_add_content
>-tp_svc_channel_type_call_return_from_hangup
>-tp_svc_channel_type_call_return_from_set_queued
>-tp_svc_channel_type_call_return_from_set_ringing
>-tp_svc_channel_type_call_set_queued_impl
>-tp_svc_channel_type_call_set_ringing_impl
>-<SUBSECTION Standard>
>-TP_TYPE_SVC_CHANNEL_TYPE_CALL
>-TP_IS_SVC_CHANNEL_TYPE_CALL
>-TP_SVC_CHANNEL_TYPE_CALL
>-TP_SVC_CHANNEL_TYPE_CALL_GET_CLASS
>-tp_svc_channel_type_call_get_type
>-<SUBSECTION>
>-tp_svc_channel_interface_dtmf_emit_sending_tones
>-tp_svc_channel_interface_dtmf_emit_stopped_tones
>-tp_svc_channel_interface_dtmf_emit_tones_deferred
>-tp_svc_channel_interface_dtmf_implement_multiple_tones
>-tp_svc_channel_interface_dtmf_implement_start_tone
>-tp_svc_channel_interface_dtmf_implement_stop_tone
>-tp_svc_channel_interface_dtmf_multiple_tones_impl
>-tp_svc_channel_interface_dtmf_return_from_multiple_tones
>-tp_svc_channel_interface_dtmf_return_from_start_tone
>-tp_svc_channel_interface_dtmf_return_from_stop_tone
>-tp_svc_channel_interface_dtmf_start_tone_impl
>-tp_svc_channel_interface_dtmf_stop_tone_impl
>-<SUBSECTION Standard>
>-TpSvcChannelInterfaceDTMF
>-TpSvcChannelInterfaceDTMFClass
>-TP_IS_SVC_CHANNEL_INTERFACE_DTMF
>-TP_SVC_CHANNEL_INTERFACE_DTMF_GET_CLASS
>-TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF
>-tp_svc_channel_interface_dtmf_get_type
>-<SUBSECTION>
>-tp_svc_channel_interface_hold_emit_hold_state_changed
>-tp_svc_channel_interface_hold_get_hold_state_impl
>-tp_svc_channel_interface_hold_implement_get_hold_state
>-tp_svc_channel_interface_hold_implement_request_hold
>-tp_svc_channel_interface_hold_request_hold_impl
>-tp_svc_channel_interface_hold_return_from_get_hold_state
>-tp_svc_channel_interface_hold_return_from_request_hold
>-<SUBSECTION Standard>
>-TpSvcChannelInterfaceHold
>-TpSvcChannelInterfaceHoldClass
>-TP_IS_SVC_CHANNEL_INTERFACE_HOLD
>-TP_SVC_CHANNEL_INTERFACE_DTMF
>-TP_SVC_CHANNEL_INTERFACE_HOLD
>-TP_SVC_CHANNEL_INTERFACE_HOLD_GET_CLASS
>-TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD
>-tp_svc_channel_interface_hold_get_type
>-<SUBSECTION>
>-TpSvcCallContent
>-TpSvcCallContentClass
>-tp_svc_call_content_emit_streams_added
>-tp_svc_call_content_emit_streams_removed
>-tp_svc_call_content_implement_remove
>-tp_svc_call_content_remove_impl
>-tp_svc_call_content_return_from_remove
>-<SUBSECTION Standard>
>-tp_svc_call_content_get_type
>-TP_SVC_CALL_CONTENT
>-TP_SVC_CALL_CONTENT_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT
>-TP_TYPE_SVC_CALL_CONTENT
>-<SUBSECTION>
>-TpSvcCallContentInterfaceMedia
>-TpSvcCallContentInterfaceMediaClass
>-tp_svc_call_content_interface_media_acknowledge_dtmf_change_impl
>-tp_svc_call_content_interface_media_emit_dtmf_change_requested
>-tp_svc_call_content_interface_media_emit_local_media_description_changed
>-tp_svc_call_content_interface_media_emit_media_description_offer_done
>-tp_svc_call_content_interface_media_emit_media_descriptions_removed
>-tp_svc_call_content_interface_media_emit_new_media_description_offer
>-tp_svc_call_content_interface_media_emit_remote_media_descriptions_changed
>-tp_svc_call_content_interface_media_fail_impl
>-tp_svc_call_content_interface_media_implement_acknowledge_dtmf_change
>-tp_svc_call_content_interface_media_implement_fail
>-tp_svc_call_content_interface_media_implement_update_local_media_description
>-tp_svc_call_content_interface_media_return_from_acknowledge_dtmf_change
>-tp_svc_call_content_interface_media_return_from_fail
>-tp_svc_call_content_interface_media_return_from_update_local_media_description
>-tp_svc_call_content_interface_media_update_local_media_description_impl
>-<SUBSECTION Standard>
>-tp_svc_call_content_interface_media_get_type
>-TP_SVC_CALL_CONTENT_INTERFACE_MEDIA
>-TP_SVC_CALL_CONTENT_INTERFACE_MEDIA_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT_INTERFACE_MEDIA
>-TP_TYPE_SVC_CALL_CONTENT_INTERFACE_MEDIA
>-<SUBSECTION>
>-TpSvcCallContentInterfaceVideoControl
>-TpSvcCallContentInterfaceVideoControlClass
>-tp_svc_call_content_interface_video_control_emit_bitrate_changed
>-tp_svc_call_content_interface_video_control_emit_framerate_changed
>-tp_svc_call_content_interface_video_control_emit_key_frame_requested
>-tp_svc_call_content_interface_video_control_emit_mtu_changed
>-tp_svc_call_content_interface_video_control_emit_video_resolution_changed
>-<SUBSECTION Standard>
>-tp_svc_call_content_interface_video_control_get_type
>-TP_SVC_CALL_CONTENT_INTERFACE_VIDEO_CONTROL
>-TP_SVC_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT_INTERFACE_VIDEO_CONTROL
>-TP_TYPE_SVC_CALL_CONTENT_INTERFACE_VIDEO_CONTROL
>-<SUBSECTION>
>-TpSvcCallContentInterfaceAudioControl
>-TpSvcCallContentInterfaceAudioControlClass
>-tp_svc_call_content_interface_audio_control_implement_report_input_volume
>-tp_svc_call_content_interface_audio_control_implement_report_output_volume
>-tp_svc_call_content_interface_audio_control_report_input_volume_impl
>-tp_svc_call_content_interface_audio_control_report_output_volume_impl
>-tp_svc_call_content_interface_audio_control_return_from_report_input_volume
>-tp_svc_call_content_interface_audio_control_return_from_report_output_volume
>-<SUBSECTION Standard>
>-tp_svc_call_content_interface_audio_control_get_type
>-TP_IS_SVC_CALL_CONTENT_INTERFACE_AUDIO_CONTROL
>-TP_SVC_CALL_CONTENT_INTERFACE_AUDIO_CONTROL
>-TP_SVC_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_GET_CLASS
>-TP_TYPE_SVC_CALL_CONTENT_INTERFACE_AUDIO_CONTROL
>-<SUBSECTION>
>-TpSvcCallContentInterfaceDTMF
>-TpSvcCallContentInterfaceDTMFClass
>-tp_svc_call_content_interface_dtmf_emit_sending_tones
>-tp_svc_call_content_interface_dtmf_emit_stopped_tones
>-tp_svc_call_content_interface_dtmf_emit_tones_deferred
>-tp_svc_call_content_interface_dtmf_implement_multiple_tones
>-tp_svc_call_content_interface_dtmf_implement_start_tone
>-tp_svc_call_content_interface_dtmf_implement_stop_tone
>-tp_svc_call_content_interface_dtmf_multiple_tones_impl
>-tp_svc_call_content_interface_dtmf_return_from_multiple_tones
>-tp_svc_call_content_interface_dtmf_return_from_start_tone
>-tp_svc_call_content_interface_dtmf_return_from_stop_tone
>-tp_svc_call_content_interface_dtmf_start_tone_impl
>-tp_svc_call_content_interface_dtmf_stop_tone_impl
>-<SUBSECTION Standard>
>-tp_svc_call_content_interface_dtmf_get_type
>-TP_IS_SVC_CALL_CONTENT_INTERFACE_DTMF
>-TP_SVC_CALL_CONTENT_INTERFACE_DTMF
>-TP_SVC_CALL_CONTENT_INTERFACE_DTMF_GET_CLASS
>-TP_TYPE_SVC_CALL_CONTENT_INTERFACE_DTMF
>-<SUBSECTION>
>-TpSvcCallContentMediaDescription
>-TpSvcCallContentMediaDescriptionClass
>-tp_svc_call_content_media_description_accept_impl
>-tp_svc_call_content_media_description_implement_accept
>-tp_svc_call_content_media_description_implement_reject
>-tp_svc_call_content_media_description_return_from_accept
>-tp_svc_call_content_media_description_return_from_reject
>-tp_svc_call_content_media_description_reject_impl
>-<SUBSECTION Standard>
>-tp_svc_call_content_media_description_get_type
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT_MEDIA_DESCRIPTION
>-TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION
>-<SUBSECTION>
>-TpSvcCallContentMediaDescriptionInterfaceRTCPExtendedReports
>-TpSvcCallContentMediaDescriptionInterfaceRTCPExtendedReportsClass
>-<SUBSECTION Standard>
>-tp_svc_call_content_media_description_interface_rtcp_extended_reports_get_type
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS
>-TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS
>-<SUBSECTION>
>-TpSvcCallContentMediaDescriptionInterfaceRTCPFeedback
>-TpSvcCallContentMediaDescriptionInterfaceRTCPFeedbackClass
>-<SUBSECTION Standard>
>-tp_svc_call_content_media_description_interface_rtcp_feedback_get_type
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
>-TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
>-<SUBSECTION>
>-TpSvcCallContentMediaDescriptionInterfaceRTPHeaderExtensions
>-TpSvcCallContentMediaDescriptionInterfaceRTPHeaderExtensionsClass
>-<SUBSECTION Standard>
>-tp_svc_call_content_media_description_interface_rtp_header_extensions_get_type
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
>-TP_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS_GET_CLASS
>-TP_IS_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
>-TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
>-<SUBSECTION>
>-TpSvcCallStream
>-TpSvcCallStreamClass
>-tp_svc_call_stream_implement_request_receiving
>-tp_svc_call_stream_implement_set_sending
>-tp_svc_call_stream_emit_local_sending_state_changed
>-tp_svc_call_stream_emit_remote_members_changed
>-tp_svc_call_stream_request_receiving_impl
>-tp_svc_call_stream_return_from_request_receiving
>-tp_svc_call_stream_return_from_set_sending
>-tp_svc_call_stream_set_sending_impl
>-<SUBSECTION Standard>
>-tp_svc_call_stream_get_type
>-TP_TYPE_SVC_CALL_STREAM
>-TP_SVC_CALL_STREAM
>-TP_SVC_CALL_STREAM_GET_CLASS
>-TP_IS_SVC_CALL_STREAM
>-<SUBSECTION>
>-TpSvcCallStreamInterfaceMedia
>-TpSvcCallStreamInterfaceMediaClass
>-tp_svc_call_stream_interface_media_add_candidates_impl
>-tp_svc_call_stream_interface_media_complete_receiving_state_change_impl
>-tp_svc_call_stream_interface_media_complete_sending_state_change_impl
>-tp_svc_call_stream_interface_media_emit_endpoints_changed
>-tp_svc_call_stream_interface_media_emit_ice_restart_requested
>-tp_svc_call_stream_interface_media_emit_local_candidates_added
>-tp_svc_call_stream_interface_media_emit_local_credentials_changed
>-tp_svc_call_stream_interface_media_emit_receiving_state_changed
>-tp_svc_call_stream_interface_media_emit_relay_info_changed
>-tp_svc_call_stream_interface_media_emit_sending_state_changed
>-tp_svc_call_stream_interface_media_emit_server_info_retrieved
>-tp_svc_call_stream_interface_media_emit_stun_servers_changed
>-tp_svc_call_stream_interface_media_fail_impl
>-tp_svc_call_stream_interface_media_finish_initial_candidates_impl
>-tp_svc_call_stream_interface_media_implement_add_candidates
>-tp_svc_call_stream_interface_media_implement_complete_receiving_state_change
>-tp_svc_call_stream_interface_media_implement_complete_sending_state_change
>-tp_svc_call_stream_interface_media_implement_fail
>-tp_svc_call_stream_interface_media_implement_finish_initial_candidates
>-tp_svc_call_stream_interface_media_implement_report_receiving_failure
>-tp_svc_call_stream_interface_media_implement_report_sending_failure
>-tp_svc_call_stream_interface_media_implement_set_credentials
>-tp_svc_call_stream_interface_media_report_receiving_failure_impl
>-tp_svc_call_stream_interface_media_report_sending_failure_impl
>-tp_svc_call_stream_interface_media_return_from_add_candidates
>-tp_svc_call_stream_interface_media_return_from_complete_receiving_state_change
>-tp_svc_call_stream_interface_media_return_from_complete_sending_state_change
>-tp_svc_call_stream_interface_media_return_from_fail
>-tp_svc_call_stream_interface_media_return_from_finish_initial_candidates
>-tp_svc_call_stream_interface_media_return_from_report_receiving_failure
>-tp_svc_call_stream_interface_media_return_from_report_sending_failure
>-tp_svc_call_stream_interface_media_return_from_set_credentials
>-tp_svc_call_stream_interface_media_set_credentials_impl
>-<SUBSECTION Standard>
>-TP_SVC_CALL_STREAM_INTERFACE_MEDIA
>-TP_SVC_CALL_STREAM_INTERFACE_MEDIA_GET_CLASS
>-TP_TYPE_SVC_CALL_STREAM_INTERFACE_MEDIA
>-TP_IS_SVC_CALL_STREAM_INTERFACE_MEDIA
>-tp_svc_call_stream_interface_media_get_type
>-<SUBSECTION>
>-TpSvcCallStreamEndpoint
>-TpSvcCallStreamEndpointClass
>-tp_svc_call_stream_endpoint_accept_selected_candidate_pair_impl
>-tp_svc_call_stream_endpoint_emit_candidate_pair_selected
>-tp_svc_call_stream_endpoint_emit_controlling_changed
>-tp_svc_call_stream_endpoint_emit_endpoint_state_changed
>-tp_svc_call_stream_endpoint_emit_remote_candidates_added
>-tp_svc_call_stream_endpoint_emit_remote_credentials_set
>-tp_svc_call_stream_endpoint_implement_accept_selected_candidate_pair
>-tp_svc_call_stream_endpoint_implement_reject_selected_candidate_pair
>-tp_svc_call_stream_endpoint_implement_set_controlling
>-tp_svc_call_stream_endpoint_implement_set_endpoint_state
>-tp_svc_call_stream_endpoint_implement_set_selected_candidate_pair
>-tp_svc_call_stream_endpoint_reject_selected_candidate_pair_impl
>-tp_svc_call_stream_endpoint_return_from_accept_selected_candidate_pair
>-tp_svc_call_stream_endpoint_return_from_reject_selected_candidate_pair
>-tp_svc_call_stream_endpoint_return_from_set_controlling
>-tp_svc_call_stream_endpoint_return_from_set_endpoint_state
>-tp_svc_call_stream_endpoint_return_from_set_selected_candidate_pair
>-tp_svc_call_stream_endpoint_set_controlling_impl
>-tp_svc_call_stream_endpoint_set_endpoint_state_impl
>-tp_svc_call_stream_endpoint_set_selected_candidate_pair_impl
>-<SUBSECTION Standard>
>-tp_svc_call_stream_endpoint_get_type
>-TP_IS_SVC_CALL_STREAM_ENDPOINT
>-TP_SVC_CALL_STREAM_ENDPOINT
>-TP_SVC_CALL_STREAM_ENDPOINT_GET_CLASS
>-TP_TYPE_SVC_CALL_STREAM_ENDPOINT
>+TpSvcChannelTypeCall1
>+TpSvcChannelTypeCall1Class
>+tp_svc_channel_type_call1_accept_impl
>+tp_svc_channel_type_call1_add_content_impl
>+tp_svc_channel_type_call1_emit_call_members_changed
>+tp_svc_channel_type_call1_emit_call_state_changed
>+tp_svc_channel_type_call1_emit_content_added
>+tp_svc_channel_type_call1_emit_content_removed
>+tp_svc_channel_type_call1_hangup_impl
>+tp_svc_channel_type_call1_implement_accept
>+tp_svc_channel_type_call1_implement_add_content
>+tp_svc_channel_type_call1_implement_hangup
>+tp_svc_channel_type_call1_implement_set_queued
>+tp_svc_channel_type_call1_implement_set_ringing
>+tp_svc_channel_type_call1_return_from_accept
>+tp_svc_channel_type_call1_return_from_add_content
>+tp_svc_channel_type_call1_return_from_hangup
>+tp_svc_channel_type_call1_return_from_set_queued
>+tp_svc_channel_type_call1_return_from_set_ringing
>+tp_svc_channel_type_call1_set_queued_impl
>+tp_svc_channel_type_call1_set_ringing_impl
>+<SUBSECTION Standard>
>+TP_TYPE_SVC_CHANNEL_TYPE_CALL1
>+TP_IS_SVC_CHANNEL_TYPE_CALL1
>+TP_SVC_CHANNEL_TYPE_CALL1
>+TP_SVC_CHANNEL_TYPE_CALL1_GET_CLASS
>+tp_svc_channel_type_call1_get_type
>+<SUBSECTION>
>+tp_svc_channel_interface_dtmf1_emit_sending_tones
>+tp_svc_channel_interface_dtmf1_emit_stopped_tones
>+tp_svc_channel_interface_dtmf1_emit_tones_deferred
>+tp_svc_channel_interface_dtmf1_implement_multiple_tones
>+tp_svc_channel_interface_dtmf1_implement_start_tone
>+tp_svc_channel_interface_dtmf1_implement_stop_tone
>+tp_svc_channel_interface_dtmf1_multiple_tones_impl
>+tp_svc_channel_interface_dtmf1_return_from_multiple_tones
>+tp_svc_channel_interface_dtmf1_return_from_start_tone
>+tp_svc_channel_interface_dtmf1_return_from_stop_tone
>+tp_svc_channel_interface_dtmf1_start_tone_impl
>+tp_svc_channel_interface_dtmf1_stop_tone_impl
>+<SUBSECTION Standard>
>+TpSvcChannelInterfaceDTMF1
>+TpSvcChannelInterfaceDTMF1Class
>+TP_IS_SVC_CHANNEL_INTERFACE_DTMF1
>+TP_SVC_CHANNEL_INTERFACE_DTMF1_GET_CLASS
>+TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1
>+tp_svc_channel_interface_dtmf1_get_type
>+<SUBSECTION>
>+tp_svc_channel_interface_hold1_emit_hold_state_changed
>+tp_svc_channel_interface_hold1_get_hold_state_impl
>+tp_svc_channel_interface_hold1_implement_get_hold_state
>+tp_svc_channel_interface_hold1_implement_request_hold
>+tp_svc_channel_interface_hold1_request_hold_impl
>+tp_svc_channel_interface_hold1_return_from_get_hold_state
>+tp_svc_channel_interface_hold1_return_from_request_hold
>+<SUBSECTION Standard>
>+TpSvcChannelInterfaceHold1
>+TpSvcChannelInterfaceHold1Class
>+TP_IS_SVC_CHANNEL_INTERFACE_HOLD1
>+TP_SVC_CHANNEL_INTERFACE_DTMF1
>+TP_SVC_CHANNEL_INTERFACE_HOLD1
>+TP_SVC_CHANNEL_INTERFACE_HOLD1_GET_CLASS
>+TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD1
>+tp_svc_channel_interface_hold1_get_type
>+<SUBSECTION>
>+TpSvcCall1Content
>+TpSvcCall1ContentClass
>+tp_svc_call1_content_emit_streams_added
>+tp_svc_call1_content_emit_streams_removed
>+tp_svc_call1_content_implement_remove
>+tp_svc_call1_content_remove_impl
>+tp_svc_call1_content_return_from_remove
>+<SUBSECTION Standard>
>+tp_svc_call1_content_get_type
>+TP_SVC_CALL1_CONTENT
>+TP_SVC_CALL1_CONTENT_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT
>+TP_TYPE_SVC_CALL1_CONTENT
>+<SUBSECTION>
>+TpSvcCall1ContentInterfaceMedia
>+TpSvcCall1ContentInterfaceMediaClass
>+tp_svc_call1_content_interface_media_acknowledge_dtmf_change_impl
>+tp_svc_call1_content_interface_media_emit_dtmf_change_requested
>+tp_svc_call1_content_interface_media_emit_local_media_description_changed
>+tp_svc_call1_content_interface_media_emit_media_description_offer_done
>+tp_svc_call1_content_interface_media_emit_media_descriptions_removed
>+tp_svc_call1_content_interface_media_emit_new_media_description_offer
>+tp_svc_call1_content_interface_media_emit_remote_media_descriptions_changed
>+tp_svc_call1_content_interface_media_fail_impl
>+tp_svc_call1_content_interface_media_implement_acknowledge_dtmf_change
>+tp_svc_call1_content_interface_media_implement_fail
>+tp_svc_call1_content_interface_media_implement_update_local_media_description
>+tp_svc_call1_content_interface_media_return_from_acknowledge_dtmf_change
>+tp_svc_call1_content_interface_media_return_from_fail
>+tp_svc_call1_content_interface_media_return_from_update_local_media_description
>+tp_svc_call1_content_interface_media_update_local_media_description_impl
>+<SUBSECTION Standard>
>+tp_svc_call1_content_interface_media_get_type
>+TP_SVC_CALL1_CONTENT_INTERFACE_MEDIA
>+TP_SVC_CALL1_CONTENT_INTERFACE_MEDIA_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT_INTERFACE_MEDIA
>+TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_MEDIA
>+<SUBSECTION>
>+TpSvcCall1ContentInterfaceVideoControl1
>+TpSvcCall1ContentInterfaceVideoControl1Class
>+tp_svc_call1_content_interface_video_control1_emit_bitrate_changed
>+tp_svc_call1_content_interface_video_control1_emit_framerate_changed
>+tp_svc_call1_content_interface_video_control1_emit_key_frame_requested
>+tp_svc_call1_content_interface_video_control1_emit_mtu_changed
>+tp_svc_call1_content_interface_video_control1_emit_video_resolution_changed
>+<SUBSECTION Standard>
>+tp_svc_call1_content_interface_video_control1_get_type
>+TP_SVC_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1
>+TP_SVC_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1
>+TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1
>+<SUBSECTION>
>+TpSvcCall1ContentInterfaceAudioControl1
>+TpSvcCall1ContentInterfaceAudioControl1Class
>+tp_svc_call1_content_interface_audio_control1_implement_report_input_volume
>+tp_svc_call1_content_interface_audio_control1_implement_report_output_volume
>+tp_svc_call1_content_interface_audio_control1_report_input_volume_impl
>+tp_svc_call1_content_interface_audio_control1_report_output_volume_impl
>+tp_svc_call1_content_interface_audio_control1_return_from_report_input_volume
>+tp_svc_call1_content_interface_audio_control1_return_from_report_output_volume
>+<SUBSECTION Standard>
>+tp_svc_call1_content_interface_audio_control1_get_type
>+TP_IS_SVC_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1
>+TP_SVC_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1
>+TP_SVC_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1_GET_CLASS
>+TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1
>+<SUBSECTION>
>+TpSvcCall1ContentInterfaceDTMF1
>+TpSvcCall1ContentInterfaceDTMF1Class
>+tp_svc_call1_content_interface_dtmf1_emit_sending_tones
>+tp_svc_call1_content_interface_dtmf1_emit_stopped_tones
>+tp_svc_call1_content_interface_dtmf1_emit_tones_deferred
>+tp_svc_call1_content_interface_dtmf1_implement_multiple_tones
>+tp_svc_call1_content_interface_dtmf1_implement_start_tone
>+tp_svc_call1_content_interface_dtmf1_implement_stop_tone
>+tp_svc_call1_content_interface_dtmf1_multiple_tones_impl
>+tp_svc_call1_content_interface_dtmf1_return_from_multiple_tones
>+tp_svc_call1_content_interface_dtmf1_return_from_start_tone
>+tp_svc_call1_content_interface_dtmf1_return_from_stop_tone
>+tp_svc_call1_content_interface_dtmf1_start_tone_impl
>+tp_svc_call1_content_interface_dtmf1_stop_tone_impl
>+<SUBSECTION Standard>
>+tp_svc_call1_content_interface_dtmf1_get_type
>+TP_IS_SVC_CALL1_CONTENT_INTERFACE_DTMF1
>+TP_SVC_CALL1_CONTENT_INTERFACE_DTMF1
>+TP_SVC_CALL1_CONTENT_INTERFACE_DTMF1_GET_CLASS
>+TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_DTMF1
>+<SUBSECTION>
>+TpSvcCall1ContentMediaDescription
>+TpSvcCall1ContentMediaDescriptionClass
>+tp_svc_call1_content_media_description_accept_impl
>+tp_svc_call1_content_media_description_implement_accept
>+tp_svc_call1_content_media_description_implement_reject
>+tp_svc_call1_content_media_description_return_from_accept
>+tp_svc_call1_content_media_description_return_from_reject
>+tp_svc_call1_content_media_description_reject_impl
>+<SUBSECTION Standard>
>+tp_svc_call1_content_media_description_get_type
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION
>+TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION
>+<SUBSECTION>
>+TpSvcCall1ContentMediaDescriptionInterfaceRTCPExtendedReports1
>+TpSvcCall1ContentMediaDescriptionInterfaceRTCPExtendedReports1Class
>+<SUBSECTION Standard>
>+tp_svc_call1_content_media_description_interface_rtcp_extended_reports1_get_type
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1
>+TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1
>+<SUBSECTION>
>+TpSvcCall1ContentMediaDescriptionInterfaceRTCPFeedback1
>+TpSvcCall1ContentMediaDescriptionInterfaceRTCPFeedback1Class
>+<SUBSECTION Standard>
>+tp_svc_call1_content_media_description_interface_rtcp_feedback1_get_type
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1
>+TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1
>+<SUBSECTION>
>+TpSvcCall1ContentMediaDescriptionInterfaceRTPHeaderExtensions1
>+TpSvcCall1ContentMediaDescriptionInterfaceRTPHeaderExtensions1Class
>+<SUBSECTION Standard>
>+tp_svc_call1_content_media_description_interface_rtp_header_extensions1_get_type
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1
>+TP_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1_GET_CLASS
>+TP_IS_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1
>+TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1
>+<SUBSECTION>
>+TpSvcCall1Stream
>+TpSvcCall1StreamClass
>+tp_svc_call1_stream_implement_request_receiving
>+tp_svc_call1_stream_implement_set_sending
>+tp_svc_call1_stream_emit_local_sending_state_changed
>+tp_svc_call1_stream_emit_remote_members_changed
>+tp_svc_call1_stream_request_receiving_impl
>+tp_svc_call1_stream_return_from_request_receiving
>+tp_svc_call1_stream_return_from_set_sending
>+tp_svc_call1_stream_set_sending_impl
>+<SUBSECTION Standard>
>+tp_svc_call1_stream_get_type
>+TP_TYPE_SVC_CALL1_STREAM
>+TP_SVC_CALL1_STREAM
>+TP_SVC_CALL1_STREAM_GET_CLASS
>+TP_IS_SVC_CALL1_STREAM
>+<SUBSECTION>
>+TpSvcCall1StreamInterfaceMedia
>+TpSvcCall1StreamInterfaceMediaClass
>+tp_svc_call1_stream_interface_media_add_candidates_impl
>+tp_svc_call1_stream_interface_media_complete_receiving_state_change_impl
>+tp_svc_call1_stream_interface_media_complete_sending_state_change_impl
>+tp_svc_call1_stream_interface_media_emit_endpoints_changed
>+tp_svc_call1_stream_interface_media_emit_ice_restart_requested
>+tp_svc_call1_stream_interface_media_emit_local_candidates_added
>+tp_svc_call1_stream_interface_media_emit_local_credentials_changed
>+tp_svc_call1_stream_interface_media_emit_receiving_state_changed
>+tp_svc_call1_stream_interface_media_emit_relay_info_changed
>+tp_svc_call1_stream_interface_media_emit_sending_state_changed
>+tp_svc_call1_stream_interface_media_emit_server_info_retrieved
>+tp_svc_call1_stream_interface_media_emit_stun_servers_changed
>+tp_svc_call1_stream_interface_media_fail_impl
>+tp_svc_call1_stream_interface_media_finish_initial_candidates_impl
>+tp_svc_call1_stream_interface_media_implement_add_candidates
>+tp_svc_call1_stream_interface_media_implement_complete_receiving_state_change
>+tp_svc_call1_stream_interface_media_implement_complete_sending_state_change
>+tp_svc_call1_stream_interface_media_implement_fail
>+tp_svc_call1_stream_interface_media_implement_finish_initial_candidates
>+tp_svc_call1_stream_interface_media_implement_report_receiving_failure
>+tp_svc_call1_stream_interface_media_implement_report_sending_failure
>+tp_svc_call1_stream_interface_media_implement_set_credentials
>+tp_svc_call1_stream_interface_media_report_receiving_failure_impl
>+tp_svc_call1_stream_interface_media_report_sending_failure_impl
>+tp_svc_call1_stream_interface_media_return_from_add_candidates
>+tp_svc_call1_stream_interface_media_return_from_complete_receiving_state_change
>+tp_svc_call1_stream_interface_media_return_from_complete_sending_state_change
>+tp_svc_call1_stream_interface_media_return_from_fail
>+tp_svc_call1_stream_interface_media_return_from_finish_initial_candidates
>+tp_svc_call1_stream_interface_media_return_from_report_receiving_failure
>+tp_svc_call1_stream_interface_media_return_from_report_sending_failure
>+tp_svc_call1_stream_interface_media_return_from_set_credentials
>+tp_svc_call1_stream_interface_media_set_credentials_impl
>+<SUBSECTION Standard>
>+TP_SVC_CALL1_STREAM_INTERFACE_MEDIA
>+TP_SVC_CALL1_STREAM_INTERFACE_MEDIA_GET_CLASS
>+TP_TYPE_SVC_CALL1_STREAM_INTERFACE_MEDIA
>+TP_IS_SVC_CALL1_STREAM_INTERFACE_MEDIA
>+tp_svc_call1_stream_interface_media_get_type
>+<SUBSECTION>
>+TpSvcCall1StreamEndpoint
>+TpSvcCall1StreamEndpointClass
>+tp_svc_call1_stream_endpoint_accept_selected_candidate_pair_impl
>+tp_svc_call1_stream_endpoint_emit_candidate_pair_selected
>+tp_svc_call1_stream_endpoint_emit_controlling_changed
>+tp_svc_call1_stream_endpoint_emit_endpoint_state_changed
>+tp_svc_call1_stream_endpoint_emit_remote_candidates_added
>+tp_svc_call1_stream_endpoint_emit_remote_credentials_set
>+tp_svc_call1_stream_endpoint_implement_accept_selected_candidate_pair
>+tp_svc_call1_stream_endpoint_implement_reject_selected_candidate_pair
>+tp_svc_call1_stream_endpoint_implement_set_controlling
>+tp_svc_call1_stream_endpoint_implement_set_endpoint_state
>+tp_svc_call1_stream_endpoint_implement_set_selected_candidate_pair
>+tp_svc_call1_stream_endpoint_reject_selected_candidate_pair_impl
>+tp_svc_call1_stream_endpoint_return_from_accept_selected_candidate_pair
>+tp_svc_call1_stream_endpoint_return_from_reject_selected_candidate_pair
>+tp_svc_call1_stream_endpoint_return_from_set_controlling
>+tp_svc_call1_stream_endpoint_return_from_set_endpoint_state
>+tp_svc_call1_stream_endpoint_return_from_set_selected_candidate_pair
>+tp_svc_call1_stream_endpoint_set_controlling_impl
>+tp_svc_call1_stream_endpoint_set_endpoint_state_impl
>+tp_svc_call1_stream_endpoint_set_selected_candidate_pair_impl
>+<SUBSECTION Standard>
>+tp_svc_call1_stream_endpoint_get_type
>+TP_IS_SVC_CALL1_STREAM_ENDPOINT
>+TP_SVC_CALL1_STREAM_ENDPOINT
>+TP_SVC_CALL1_STREAM_ENDPOINT_GET_CLASS
>+TP_TYPE_SVC_CALL1_STREAM_ENDPOINT
> </SECTION>
> 
> <SECTION>
> <FILE>svc-anonymity</FILE>
> <TITLE>svc-anonymity</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcConnectionInterfaceAnonymity
>-TpSvcConnectionInterfaceAnonymityClass
>-tp_svc_connection_interface_anonymity_emit_anonymity_modes_changed
>+TpSvcConnectionInterfaceAnonymity1
>+TpSvcConnectionInterfaceAnonymity1Class
>+tp_svc_connection_interface_anonymity1_emit_anonymity_modes_changed
> <SUBSECTION>
>-TpSvcChannelInterfaceAnonymity
>-TpSvcChannelInterfaceAnonymityClass
>+TpSvcChannelInterfaceAnonymity1
>+TpSvcChannelInterfaceAnonymity1Class
> <SUBSECTION Standard>
>-tp_svc_channel_interface_anonymity_get_type
>-TP_IS_SVC_CHANNEL_INTERFACE_ANONYMITY
>-TP_SVC_CHANNEL_INTERFACE_ANONYMITY
>-TP_SVC_CHANNEL_INTERFACE_ANONYMITY_GET_CLASS
>-TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMITY
>-TP_IS_SVC_CONNECTION_INTERFACE_ANONYMITY
>-TP_SVC_CONNECTION_INTERFACE_ANONYMITY
>-TP_SVC_CONNECTION_INTERFACE_ANONYMITY_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_ANONYMITY
>-tp_svc_connection_interface_anonymity_get_type
>+tp_svc_channel_interface_anonymity1_get_type
>+TP_IS_SVC_CHANNEL_INTERFACE_ANONYMITY1
>+TP_SVC_CHANNEL_INTERFACE_ANONYMITY1
>+TP_SVC_CHANNEL_INTERFACE_ANONYMITY1_GET_CLASS
>+TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMITY1
>+TP_IS_SVC_CONNECTION_INTERFACE_ANONYMITY1
>+TP_SVC_CONNECTION_INTERFACE_ANONYMITY1
>+TP_SVC_CONNECTION_INTERFACE_ANONYMITY1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_ANONYMITY1
>+tp_svc_connection_interface_anonymity1_get_type
> </SECTION>
> 
> <SECTION>
> <FILE>svc-service-point</FILE>
> <TITLE>svc-service-point</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcConnectionInterfaceServicePoint
>-TpSvcConnectionInterfaceServicePointClass
>-tp_svc_connection_interface_service_point_emit_service_points_changed
>+TpSvcConnectionInterfaceServicePoint1
>+TpSvcConnectionInterfaceServicePoint1Class
>+tp_svc_connection_interface_service_point1_emit_service_points_changed
> <SUBSECTION>
>-TpSvcChannelInterfaceServicePoint
>-TpSvcChannelInterfaceServicePointClass
>-tp_svc_channel_interface_service_point_emit_service_point_changed
>+TpSvcChannelInterfaceServicePoint1
>+TpSvcChannelInterfaceServicePoint1Class
>+tp_svc_channel_interface_service_point1_emit_service_point_changed
> <SUBSECTION Standard>
>-tp_svc_channel_interface_service_point_get_type
>-TP_IS_SVC_CHANNEL_INTERFACE_SERVICE_POINT
>-TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT
>-TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT_GET_CLASS
>-TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_POINT
>-TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT
>-TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT
>-TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_SERVICE_POINT
>-tp_svc_connection_interface_service_point_get_type
>+tp_svc_channel_interface_service_point1_get_type
>+TP_IS_SVC_CHANNEL_INTERFACE_SERVICE_POINT1
>+TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT1
>+TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT1_GET_CLASS
>+TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_POINT1
>+TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT1
>+TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT1
>+TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_SERVICE_POINT1
>+tp_svc_connection_interface_service_point1_get_type
> </SECTION>
> 
> <SECTION>
>@@ -973,261 +973,261 @@ TP_SVC_CONNECTION_INTERFACE_REQUESTS_GET_CLASS
> tp_svc_connection_interface_requests_get_type
> TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS
> <SUBSECTION>
>-TpSvcConnectionInterfacePresence
>-TpSvcConnectionInterfacePresenceClass
>-tp_svc_connection_interface_presence_emit_presences_changed
>-tp_svc_connection_interface_presence_implement_set_presence
>-tp_svc_connection_interface_presence_return_from_set_presence
>-tp_svc_connection_interface_presence_set_presence_impl
>-<SUBSECTION Standard>
>-TP_SVC_CONNECTION_INTERFACE_PRESENCE
>-TP_IS_SVC_CONNECTION_INTERFACE_PRESENCE
>-TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE
>-tp_svc_connection_interface_presence_get_type
>-TP_SVC_CONNECTION_INTERFACE_PRESENCE_GET_CLASS
>-<SUBSECTION>
>-TpSvcConnectionInterfaceAvatars
>-TpSvcConnectionInterfaceAvatarsClass
>-tp_svc_connection_interface_avatars_clear_avatar_impl
>-tp_svc_connection_interface_avatars_implement_clear_avatar
>-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_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
>-TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS
>-tp_svc_connection_interface_avatars_get_type
>-TP_SVC_CONNECTION_INTERFACE_AVATARS_GET_CLASS
>-<SUBSECTION>
>-TpSvcConnectionInterfaceAliasing
>-TpSvcConnectionInterfaceAliasingClass
>-tp_svc_connection_interface_aliasing_request_aliases_impl
>-tp_svc_connection_interface_aliasing_implement_request_aliases
>-tp_svc_connection_interface_aliasing_return_from_request_aliases
>-tp_svc_connection_interface_aliasing_set_aliases_impl
>-tp_svc_connection_interface_aliasing_implement_set_aliases
>-tp_svc_connection_interface_aliasing_return_from_set_aliases
>-tp_svc_connection_interface_aliasing_emit_aliases_changed
>-<SUBSECTION Standard>
>-TP_SVC_CONNECTION_INTERFACE_ALIASING
>-TP_IS_SVC_CONNECTION_INTERFACE_ALIASING
>-TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING
>-tp_svc_connection_interface_aliasing_get_type
>-TP_SVC_CONNECTION_INTERFACE_ALIASING_GET_CLASS
>-<SUBSECTION>
>-TpSvcConnectionInterfaceBalance
>-TpSvcConnectionInterfaceBalanceClass
>-tp_svc_connection_interface_balance_emit_balance_changed
>-<SUBSECTION Standard>
>-TP_SVC_CONNECTION_INTERFACE_BALANCE
>-TP_IS_SVC_CONNECTION_INTERFACE_BALANCE
>-TP_TYPE_SVC_CONNECTION_INTERFACE_BALANCE
>-tp_svc_connection_interface_balance_get_type
>-TP_SVC_CONNECTION_INTERFACE_BALANCE_GET_CLASS
>-<SUBSECTION>
>-TpSvcConnectionInterfaceContactCapabilities
>-TpSvcConnectionInterfaceContactCapabilitiesClass
>-tp_svc_connection_interface_contact_capabilities_emit_contact_capabilities_changed
>-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
>-tp_svc_connection_interface_location_request_location_impl
>-tp_svc_connection_interface_location_return_from_request_location
>-tp_svc_connection_interface_location_implement_request_location
>-tp_svc_connection_interface_location_set_location_impl
>-tp_svc_connection_interface_location_return_from_set_location
>-tp_svc_connection_interface_location_implement_set_location
>-<SUBSECTION Standard>
>-TP_IS_SVC_CONNECTION_INTERFACE_LOCATION
>-TP_SVC_CONNECTION_INTERFACE_LOCATION
>-TP_SVC_CONNECTION_INTERFACE_LOCATION_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION
>-tp_svc_connection_interface_location_get_type
>-<SUBSECTION>
>-TpSvcConnectionInterfaceContactInfo
>-TpSvcConnectionInterfaceContactInfoClass
>-tp_svc_connection_interface_contact_info_emit_contact_info_changed
>-tp_svc_connection_interface_contact_info_implement_refresh_contact_info
>-tp_svc_connection_interface_contact_info_implement_request_contact_info
>-tp_svc_connection_interface_contact_info_implement_set_contact_info
>-tp_svc_connection_interface_contact_info_refresh_contact_info_impl
>-tp_svc_connection_interface_contact_info_request_contact_info_impl
>-tp_svc_connection_interface_contact_info_return_from_refresh_contact_info
>-tp_svc_connection_interface_contact_info_return_from_request_contact_info
>-tp_svc_connection_interface_contact_info_return_from_set_contact_info
>-tp_svc_connection_interface_contact_info_set_contact_info_impl
>-<SUBSECTION Standard>
>-tp_svc_connection_interface_contact_info_get_type
>-TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_INFO
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO
>-<SUBSECTION>
>-TpSvcConnectionInterfaceContactBlocking
>-TpSvcConnectionInterfaceContactBlockingClass
>-tp_svc_connection_interface_contact_blocking_block_contacts_impl
>-tp_svc_connection_interface_contact_blocking_emit_blocked_contacts_changed
>-tp_svc_connection_interface_contact_blocking_implement_block_contacts
>-tp_svc_connection_interface_contact_blocking_implement_request_blocked_contacts
>-tp_svc_connection_interface_contact_blocking_implement_unblock_contacts
>-tp_svc_connection_interface_contact_blocking_request_blocked_contacts_impl
>-tp_svc_connection_interface_contact_blocking_return_from_block_contacts
>-tp_svc_connection_interface_contact_blocking_return_from_request_blocked_contacts
>-tp_svc_connection_interface_contact_blocking_return_from_unblock_contacts
>-tp_svc_connection_interface_contact_blocking_unblock_contacts_impl
>-TpSvcConnectionInterfaceContactGroups
>-TpSvcConnectionInterfaceContactGroupsClass
>-tp_svc_connection_interface_contact_groups_add_to_group_impl
>-tp_svc_connection_interface_contact_groups_emit_group_renamed
>-tp_svc_connection_interface_contact_groups_emit_groups_changed
>-tp_svc_connection_interface_contact_groups_emit_groups_created
>-tp_svc_connection_interface_contact_groups_emit_groups_removed
>-tp_svc_connection_interface_contact_groups_implement_add_to_group
>-tp_svc_connection_interface_contact_groups_implement_remove_from_group
>-tp_svc_connection_interface_contact_groups_implement_remove_group
>-tp_svc_connection_interface_contact_groups_implement_rename_group
>-tp_svc_connection_interface_contact_groups_implement_set_contact_groups
>-tp_svc_connection_interface_contact_groups_implement_set_group_members
>-tp_svc_connection_interface_contact_groups_remove_from_group_impl
>-tp_svc_connection_interface_contact_groups_remove_group_impl
>-tp_svc_connection_interface_contact_groups_rename_group_impl
>-tp_svc_connection_interface_contact_groups_return_from_add_to_group
>-tp_svc_connection_interface_contact_groups_return_from_remove_from_group
>-tp_svc_connection_interface_contact_groups_return_from_remove_group
>-tp_svc_connection_interface_contact_groups_return_from_rename_group
>-tp_svc_connection_interface_contact_groups_return_from_set_contact_groups
>-tp_svc_connection_interface_contact_groups_return_from_set_group_members
>-tp_svc_connection_interface_contact_groups_set_contact_groups_impl
>-tp_svc_connection_interface_contact_groups_set_group_members_impl
>-TpSvcConnectionInterfaceContactList
>-TpSvcConnectionInterfaceContactListClass
>-tp_svc_connection_interface_contact_list_authorize_publication_impl
>-tp_svc_connection_interface_contact_list_download_impl
>-tp_svc_connection_interface_contact_list_emit_contacts_changed
>-tp_svc_connection_interface_contact_list_emit_contact_list_state_changed
>-tp_svc_connection_interface_contact_list_get_contact_list_attributes_impl
>-tp_svc_connection_interface_contact_list_implement_authorize_publication
>-tp_svc_connection_interface_contact_list_implement_download
>-tp_svc_connection_interface_contact_list_implement_get_contact_list_attributes
>-tp_svc_connection_interface_contact_list_implement_remove_contacts
>-tp_svc_connection_interface_contact_list_implement_request_subscription
>-tp_svc_connection_interface_contact_list_implement_unpublish
>-tp_svc_connection_interface_contact_list_implement_unsubscribe
>-tp_svc_connection_interface_contact_list_remove_contacts_impl
>-tp_svc_connection_interface_contact_list_request_subscription_impl
>-tp_svc_connection_interface_contact_list_return_from_authorize_publication
>-tp_svc_connection_interface_contact_list_return_from_download
>-tp_svc_connection_interface_contact_list_return_from_get_contact_list_attributes
>-tp_svc_connection_interface_contact_list_return_from_remove_contacts
>-tp_svc_connection_interface_contact_list_return_from_request_subscription
>-tp_svc_connection_interface_contact_list_return_from_unpublish
>-tp_svc_connection_interface_contact_list_return_from_unsubscribe
>-tp_svc_connection_interface_contact_list_unpublish_impl
>-tp_svc_connection_interface_contact_list_unsubscribe_impl
>-<SUBSECTION Standard>
>-tp_svc_connection_interface_contact_blocking_get_type
>-tp_svc_connection_interface_contact_list_get_type
>-tp_svc_connection_interface_contact_groups_get_type
>-TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING
>-TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS
>-TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_LIST
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING_GET_CLASS
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS_GET_CLASS
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST
>-TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING
>-TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST
>-<SUBSECTION>
>-TpSvcConnectionInterfaceCellular
>-TpSvcConnectionInterfaceCellularClass
>-tp_svc_connection_interface_cellular_emit_imsi_changed
>-<SUBSECTION Standard>
>-TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR
>-TP_SVC_CONNECTION_INTERFACE_CELLULAR
>-TP_SVC_CONNECTION_INTERFACE_CELLULAR_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_CELLULAR
>-tp_svc_connection_interface_cellular_get_type
>-<SUBSECTION>
>-TpSvcConnectionInterfaceClientTypes
>-TpSvcConnectionInterfaceClientTypesClass
>-tp_svc_connection_interface_client_types_emit_client_types_updated
>-tp_svc_connection_interface_client_types_implement_request_client_types
>-tp_svc_connection_interface_client_types_request_client_types_impl
>-tp_svc_connection_interface_client_types_return_from_request_client_types
>-<SUBSECTION Standard>
>-tp_svc_connection_interface_client_types_get_type
>-TP_IS_SVC_CONNECTION_INTERFACE_CLIENT_TYPES
>-TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES
>-TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES
>-<SUBSECTION>
>-TpSvcConnectionInterfaceMailNotification
>-TpSvcConnectionInterfaceMailNotificationClass
>-tp_svc_connection_interface_mail_notification_emit_mails_received
>-tp_svc_connection_interface_mail_notification_emit_unread_mails_changed
>-tp_svc_connection_interface_mail_notification_implement_request_inbox_url
>-tp_svc_connection_interface_mail_notification_implement_request_mail_url
>-tp_svc_connection_interface_mail_notification_request_inbox_url_impl
>-tp_svc_connection_interface_mail_notification_request_mail_url_impl
>-tp_svc_connection_interface_mail_notification_return_from_request_inbox_url
>-tp_svc_connection_interface_mail_notification_return_from_request_mail_url
>-<SUBSECTION Standard>
>-TP_IS_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION
>-TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION
>-TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION
>-tp_svc_connection_interface_mail_notification_get_type
>-<SUBSECTION>
>-TpSvcConnectionInterfacePowerSaving
>-TpSvcConnectionInterfacePowerSavingClass
>-tp_svc_connection_interface_power_saving_emit_power_saving_changed
>-tp_svc_connection_interface_power_saving_implement_set_power_saving
>-tp_svc_connection_interface_power_saving_return_from_set_power_saving
>-tp_svc_connection_interface_power_saving_set_power_saving_impl
>-<SUBSECTION Standard>
>-tp_svc_connection_interface_power_saving_get_type
>-TP_IS_SVC_CONNECTION_INTERFACE_POWER_SAVING
>-TP_SVC_CONNECTION_INTERFACE_POWER_SAVING
>-TP_SVC_CONNECTION_INTERFACE_POWER_SAVING_GET_CLASS
>-TP_TYPE_SVC_CONNECTION_INTERFACE_POWER_SAVING
>-<SUBSECTION>
>-TpSvcConnectionInterfaceAddressing
>-TpSvcConnectionInterfaceAddressingClass
>-tp_svc_connection_interface_addressing_get_contacts_by_uri_impl
>-tp_svc_connection_interface_addressing_get_contacts_by_vcard_field_impl
>-tp_svc_connection_interface_addressing_implement_get_contacts_by_uri
>-tp_svc_connection_interface_addressing_implement_get_contacts_by_vcard_field
>-tp_svc_connection_interface_addressing_return_from_get_contacts_by_uri
>-tp_svc_connection_interface_addressing_return_from_get_contacts_by_vcard_field
>-<SUBSECTION Standard>
>-TP_IS_SVC_CONNECTION_INTERFACE_ADDRESSING
>-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
>+TpSvcConnectionInterfacePresence1
>+TpSvcConnectionInterfacePresence1Class
>+tp_svc_connection_interface_presence1_emit_presences_changed
>+tp_svc_connection_interface_presence1_implement_set_presence
>+tp_svc_connection_interface_presence1_return_from_set_presence
>+tp_svc_connection_interface_presence1_set_presence_impl
>+<SUBSECTION Standard>
>+TP_SVC_CONNECTION_INTERFACE_PRESENCE1
>+TP_IS_SVC_CONNECTION_INTERFACE_PRESENCE1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1
>+tp_svc_connection_interface_presence1_get_type
>+TP_SVC_CONNECTION_INTERFACE_PRESENCE1_GET_CLASS
>+<SUBSECTION>
>+TpSvcConnectionInterfaceAvatars1
>+TpSvcConnectionInterfaceAvatars1Class
>+tp_svc_connection_interface_avatars1_clear_avatar_impl
>+tp_svc_connection_interface_avatars1_implement_clear_avatar
>+tp_svc_connection_interface_avatars1_return_from_clear_avatar
>+tp_svc_connection_interface_avatars1_set_avatar_impl
>+tp_svc_connection_interface_avatars1_implement_set_avatar
>+tp_svc_connection_interface_avatars1_return_from_set_avatar
>+tp_svc_connection_interface_avatars1_emit_avatar_updated
>+tp_svc_connection_interface_avatars1_emit_avatar_retrieved
>+tp_svc_connection_interface_avatars1_implement_request_avatars
>+tp_svc_connection_interface_avatars1_request_avatars_impl
>+tp_svc_connection_interface_avatars1_return_from_request_avatars
>+tp_svc_connection_interface_avatars1_get_known_avatar_tokens_impl
>+tp_svc_connection_interface_avatars1_implement_get_known_avatar_tokens
>+tp_svc_connection_interface_avatars1_return_from_get_known_avatar_tokens
>+<SUBSECTION Standard>
>+TP_SVC_CONNECTION_INTERFACE_AVATARS1
>+TP_IS_SVC_CONNECTION_INTERFACE_AVATARS1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS1
>+tp_svc_connection_interface_avatars1_get_type
>+TP_SVC_CONNECTION_INTERFACE_AVATARS1_GET_CLASS
>+<SUBSECTION>
>+TpSvcConnectionInterfaceAliasing1
>+TpSvcConnectionInterfaceAliasing1Class
>+tp_svc_connection_interface_aliasing1_request_aliases_impl
>+tp_svc_connection_interface_aliasing1_implement_request_aliases
>+tp_svc_connection_interface_aliasing1_return_from_request_aliases
>+tp_svc_connection_interface_aliasing1_set_aliases_impl
>+tp_svc_connection_interface_aliasing1_implement_set_aliases
>+tp_svc_connection_interface_aliasing1_return_from_set_aliases
>+tp_svc_connection_interface_aliasing1_emit_aliases_changed
>+<SUBSECTION Standard>
>+TP_SVC_CONNECTION_INTERFACE_ALIASING1
>+TP_IS_SVC_CONNECTION_INTERFACE_ALIASING1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1
>+tp_svc_connection_interface_aliasing1_get_type
>+TP_SVC_CONNECTION_INTERFACE_ALIASING1_GET_CLASS
>+<SUBSECTION>
>+TpSvcConnectionInterfaceBalance1
>+TpSvcConnectionInterfaceBalance1Class
>+tp_svc_connection_interface_balance1_emit_balance_changed
>+<SUBSECTION Standard>
>+TP_SVC_CONNECTION_INTERFACE_BALANCE1
>+TP_IS_SVC_CONNECTION_INTERFACE_BALANCE1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_BALANCE1
>+tp_svc_connection_interface_balance1_get_type
>+TP_SVC_CONNECTION_INTERFACE_BALANCE1_GET_CLASS
>+<SUBSECTION>
>+TpSvcConnectionInterfaceContactCapabilities1
>+TpSvcConnectionInterfaceContactCapabilities1Class
>+tp_svc_connection_interface_contact_capabilities1_emit_contact_capabilities_changed
>+tp_svc_connection_interface_contact_capabilities1_update_capabilities_impl
>+tp_svc_connection_interface_contact_capabilities1_return_from_update_capabilities
>+tp_svc_connection_interface_contact_capabilities1_implement_update_capabilities
>+<SUBSECTION Standard>
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1
>+TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1
>+tp_svc_connection_interface_contact_capabilities1_get_type
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1_GET_CLASS
>+<SUBSECTION>
>+TpSvcConnectionInterfaceLocation1
>+TpSvcConnectionInterfaceLocation1Class
>+tp_svc_connection_interface_location1_emit_location_updated
>+tp_svc_connection_interface_location1_request_location_impl
>+tp_svc_connection_interface_location1_return_from_request_location
>+tp_svc_connection_interface_location1_implement_request_location
>+tp_svc_connection_interface_location1_set_location_impl
>+tp_svc_connection_interface_location1_return_from_set_location
>+tp_svc_connection_interface_location1_implement_set_location
>+<SUBSECTION Standard>
>+TP_IS_SVC_CONNECTION_INTERFACE_LOCATION1
>+TP_SVC_CONNECTION_INTERFACE_LOCATION1
>+TP_SVC_CONNECTION_INTERFACE_LOCATION1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION1
>+tp_svc_connection_interface_location1_get_type
>+<SUBSECTION>
>+TpSvcConnectionInterfaceContactInfo1
>+TpSvcConnectionInterfaceContactInfo1Class
>+tp_svc_connection_interface_contact_info1_emit_contact_info_changed
>+tp_svc_connection_interface_contact_info1_implement_refresh_contact_info
>+tp_svc_connection_interface_contact_info1_implement_request_contact_info
>+tp_svc_connection_interface_contact_info1_implement_set_contact_info
>+tp_svc_connection_interface_contact_info1_refresh_contact_info_impl
>+tp_svc_connection_interface_contact_info1_request_contact_info_impl
>+tp_svc_connection_interface_contact_info1_return_from_refresh_contact_info
>+tp_svc_connection_interface_contact_info1_return_from_request_contact_info
>+tp_svc_connection_interface_contact_info1_return_from_set_contact_info
>+tp_svc_connection_interface_contact_info1_set_contact_info_impl
>+<SUBSECTION Standard>
>+tp_svc_connection_interface_contact_info1_get_type
>+TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_INFO1
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO1
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO1
>+<SUBSECTION>
>+TpSvcConnectionInterfaceContactBlocking1
>+TpSvcConnectionInterfaceContactBlocking1Class
>+tp_svc_connection_interface_contact_blocking1_block_contacts_impl
>+tp_svc_connection_interface_contact_blocking1_emit_blocked_contacts_changed
>+tp_svc_connection_interface_contact_blocking1_implement_block_contacts
>+tp_svc_connection_interface_contact_blocking1_implement_request_blocked_contacts
>+tp_svc_connection_interface_contact_blocking1_implement_unblock_contacts
>+tp_svc_connection_interface_contact_blocking1_request_blocked_contacts_impl
>+tp_svc_connection_interface_contact_blocking1_return_from_block_contacts
>+tp_svc_connection_interface_contact_blocking1_return_from_request_blocked_contacts
>+tp_svc_connection_interface_contact_blocking1_return_from_unblock_contacts
>+tp_svc_connection_interface_contact_blocking1_unblock_contacts_impl
>+TpSvcConnectionInterfaceContactGroups1
>+TpSvcConnectionInterfaceContactGroups1Class
>+tp_svc_connection_interface_contact_groups1_add_to_group_impl
>+tp_svc_connection_interface_contact_groups1_emit_group_renamed
>+tp_svc_connection_interface_contact_groups1_emit_groups_changed
>+tp_svc_connection_interface_contact_groups1_emit_groups_created
>+tp_svc_connection_interface_contact_groups1_emit_groups_removed
>+tp_svc_connection_interface_contact_groups1_implement_add_to_group
>+tp_svc_connection_interface_contact_groups1_implement_remove_from_group
>+tp_svc_connection_interface_contact_groups1_implement_remove_group
>+tp_svc_connection_interface_contact_groups1_implement_rename_group
>+tp_svc_connection_interface_contact_groups1_implement_set_contact_groups
>+tp_svc_connection_interface_contact_groups1_implement_set_group_members
>+tp_svc_connection_interface_contact_groups1_remove_from_group_impl
>+tp_svc_connection_interface_contact_groups1_remove_group_impl
>+tp_svc_connection_interface_contact_groups1_rename_group_impl
>+tp_svc_connection_interface_contact_groups1_return_from_add_to_group
>+tp_svc_connection_interface_contact_groups1_return_from_remove_from_group
>+tp_svc_connection_interface_contact_groups1_return_from_remove_group
>+tp_svc_connection_interface_contact_groups1_return_from_rename_group
>+tp_svc_connection_interface_contact_groups1_return_from_set_contact_groups
>+tp_svc_connection_interface_contact_groups1_return_from_set_group_members
>+tp_svc_connection_interface_contact_groups1_set_contact_groups_impl
>+tp_svc_connection_interface_contact_groups1_set_group_members_impl
>+TpSvcConnectionInterfaceContactList1
>+TpSvcConnectionInterfaceContactList1Class
>+tp_svc_connection_interface_contact_list1_authorize_publication_impl
>+tp_svc_connection_interface_contact_list1_download_impl
>+tp_svc_connection_interface_contact_list1_emit_contacts_changed
>+tp_svc_connection_interface_contact_list1_emit_contact_list_state_changed
>+tp_svc_connection_interface_contact_list1_get_contact_list_attributes_impl
>+tp_svc_connection_interface_contact_list1_implement_authorize_publication
>+tp_svc_connection_interface_contact_list1_implement_download
>+tp_svc_connection_interface_contact_list1_implement_get_contact_list_attributes
>+tp_svc_connection_interface_contact_list1_implement_remove_contacts
>+tp_svc_connection_interface_contact_list1_implement_request_subscription
>+tp_svc_connection_interface_contact_list1_implement_unpublish
>+tp_svc_connection_interface_contact_list1_implement_unsubscribe
>+tp_svc_connection_interface_contact_list1_remove_contacts_impl
>+tp_svc_connection_interface_contact_list1_request_subscription_impl
>+tp_svc_connection_interface_contact_list1_return_from_authorize_publication
>+tp_svc_connection_interface_contact_list1_return_from_download
>+tp_svc_connection_interface_contact_list1_return_from_get_contact_list_attributes
>+tp_svc_connection_interface_contact_list1_return_from_remove_contacts
>+tp_svc_connection_interface_contact_list1_return_from_request_subscription
>+tp_svc_connection_interface_contact_list1_return_from_unpublish
>+tp_svc_connection_interface_contact_list1_return_from_unsubscribe
>+tp_svc_connection_interface_contact_list1_unpublish_impl
>+tp_svc_connection_interface_contact_list1_unsubscribe_impl
>+<SUBSECTION Standard>
>+tp_svc_connection_interface_contact_blocking1_get_type
>+tp_svc_connection_interface_contact_list1_get_type
>+tp_svc_connection_interface_contact_groups1_get_type
>+TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1
>+TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1
>+TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_LIST1
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1_GET_CLASS
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1_GET_CLASS
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST1
>+TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1
>+<SUBSECTION>
>+TpSvcConnectionInterfaceCellular1
>+TpSvcConnectionInterfaceCellular1Class
>+tp_svc_connection_interface_cellular1_emit_imsi_changed
>+<SUBSECTION Standard>
>+TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR1
>+TP_SVC_CONNECTION_INTERFACE_CELLULAR1
>+TP_SVC_CONNECTION_INTERFACE_CELLULAR1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CELLULAR1
>+tp_svc_connection_interface_cellular1_get_type
>+<SUBSECTION>
>+TpSvcConnectionInterfaceClientTypes1
>+TpSvcConnectionInterfaceClientTypes1Class
>+tp_svc_connection_interface_client_types1_emit_client_types_updated
>+tp_svc_connection_interface_client_types1_implement_request_client_types
>+tp_svc_connection_interface_client_types1_request_client_types_impl
>+tp_svc_connection_interface_client_types1_return_from_request_client_types
>+<SUBSECTION Standard>
>+tp_svc_connection_interface_client_types1_get_type
>+TP_IS_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1
>+TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1
>+TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1
>+<SUBSECTION>
>+TpSvcConnectionInterfaceMailNotification1
>+TpSvcConnectionInterfaceMailNotification1Class
>+tp_svc_connection_interface_mail_notification1_emit_mails_received
>+tp_svc_connection_interface_mail_notification1_emit_unread_mails_changed
>+tp_svc_connection_interface_mail_notification1_implement_request_inbox_url
>+tp_svc_connection_interface_mail_notification1_implement_request_mail_url
>+tp_svc_connection_interface_mail_notification1_request_inbox_url_impl
>+tp_svc_connection_interface_mail_notification1_request_mail_url_impl
>+tp_svc_connection_interface_mail_notification1_return_from_request_inbox_url
>+tp_svc_connection_interface_mail_notification1_return_from_request_mail_url
>+<SUBSECTION Standard>
>+TP_IS_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1
>+TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1
>+TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1
>+tp_svc_connection_interface_mail_notification1_get_type
>+<SUBSECTION>
>+TpSvcConnectionInterfacePowerSaving1
>+TpSvcConnectionInterfacePowerSaving1Class
>+tp_svc_connection_interface_power_saving1_emit_power_saving_changed
>+tp_svc_connection_interface_power_saving1_implement_set_power_saving
>+tp_svc_connection_interface_power_saving1_return_from_set_power_saving
>+tp_svc_connection_interface_power_saving1_set_power_saving_impl
>+<SUBSECTION Standard>
>+tp_svc_connection_interface_power_saving1_get_type
>+TP_IS_SVC_CONNECTION_INTERFACE_POWER_SAVING1
>+TP_SVC_CONNECTION_INTERFACE_POWER_SAVING1
>+TP_SVC_CONNECTION_INTERFACE_POWER_SAVING1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_POWER_SAVING1
>+<SUBSECTION>
>+TpSvcConnectionInterfaceAddressing1
>+TpSvcConnectionInterfaceAddressing1Class
>+tp_svc_connection_interface_addressing1_get_contacts_by_uri_impl
>+tp_svc_connection_interface_addressing1_get_contacts_by_vcard_field_impl
>+tp_svc_connection_interface_addressing1_implement_get_contacts_by_uri
>+tp_svc_connection_interface_addressing1_implement_get_contacts_by_vcard_field
>+tp_svc_connection_interface_addressing1_return_from_get_contacts_by_uri
>+tp_svc_connection_interface_addressing1_return_from_get_contacts_by_vcard_field
>+<SUBSECTION Standard>
>+TP_IS_SVC_CONNECTION_INTERFACE_ADDRESSING1
>+TP_SVC_CONNECTION_INTERFACE_ADDRESSING1
>+TP_SVC_CONNECTION_INTERFACE_ADDRESSING1_GET_CLASS
>+TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRESSING1
>+tp_svc_connection_interface_addressing1_get_type
> </SECTION>
> 
> <SECTION>
>@@ -2273,12 +2273,12 @@ TP_CLIENT_OBJECT_PATH_BASE
> TP_DEBUG_OBJECT_PATH
> TP_IFACE_ACCOUNT
> TP_IFACE_QUARK_ACCOUNT
>-TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING
>-TP_IFACE_QUARK_ACCOUNT_INTERFACE_ADDRESSING
>-TP_IFACE_ACCOUNT_INTERFACE_AVATAR
>-TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR
>-TP_IFACE_ACCOUNT_INTERFACE_STORAGE
>-TP_IFACE_QUARK_ACCOUNT_INTERFACE_STORAGE
>+TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1
>+TP_IFACE_QUARK_ACCOUNT_INTERFACE_ADDRESSING1
>+TP_IFACE_ACCOUNT_INTERFACE_AVATAR1
>+TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR1
>+TP_IFACE_ACCOUNT_INTERFACE_STORAGE1
>+TP_IFACE_QUARK_ACCOUNT_INTERFACE_STORAGE1
> TP_IFACE_ACCOUNT_MANAGER
> TP_IFACE_QUARK_ACCOUNT_MANAGER
> TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE
>@@ -2291,118 +2291,118 @@ TP_IFACE_DBUS_PEER
> TP_IFACE_QUARK_DBUS_PEER
> TP_IFACE_DBUS_PROPERTIES
> TP_IFACE_QUARK_DBUS_PROPERTIES
>-TP_IFACE_DEBUG
>-TP_IFACE_QUARK_DEBUG
>+TP_IFACE_DEBUG1
>+TP_IFACE_QUARK_DEBUG1
> TP_IFACE_CONNECTION_MANAGER
> TP_IFACE_QUARK_CONNECTION_MANAGER
> TP_IFACE_PROTOCOL
> TP_IFACE_QUARK_PROTOCOL
>-TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING
>-TP_IFACE_QUARK_PROTOCOL_INTERFACE_ADDRESSING
>-TP_IFACE_PROTOCOL_INTERFACE_AVATARS
>-TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS
>-TP_IFACE_PROTOCOL_INTERFACE_PRESENCE
>-TP_IFACE_QUARK_PROTOCOL_INTERFACE_PRESENCE
>+TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1
>+TP_IFACE_QUARK_PROTOCOL_INTERFACE_ADDRESSING1
>+TP_IFACE_PROTOCOL_INTERFACE_AVATARS1
>+TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS1
>+TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1
>+TP_IFACE_QUARK_PROTOCOL_INTERFACE_PRESENCE1
> TP_IFACE_CONNECTION
> TP_IFACE_QUARK_CONNECTION
>-TP_IFACE_CONNECTION_INTERFACE_ADDRESSING
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING
>-TP_IFACE_CONNECTION_INTERFACE_ALIASING
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING
>-TP_IFACE_CONNECTION_INTERFACE_ANONYMITY
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_ANONYMITY
>-TP_IFACE_CONNECTION_INTERFACE_AVATARS
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS
>-TP_IFACE_CONNECTION_INTERFACE_BALANCE
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE
>-TP_IFACE_CONNECTION_INTERFACE_CELLULAR
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR
>-TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES
>-TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES
>-TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS
>-TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_POWER_SAVING
>-TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING
>-TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO
>-TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST
>+TP_IFACE_CONNECTION_INTERFACE_ADDRESSING1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING1
>+TP_IFACE_CONNECTION_INTERFACE_ALIASING1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING1
>+TP_IFACE_CONNECTION_INTERFACE_ANONYMITY1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_ANONYMITY1
>+TP_IFACE_CONNECTION_INTERFACE_AVATARS1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1
>+TP_IFACE_CONNECTION_INTERFACE_BALANCE1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE1
>+TP_IFACE_CONNECTION_INTERFACE_CELLULAR1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR1
>+TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES1
>+TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1
>+TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS1
>+TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_POWER_SAVING1
>+TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1
>+TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO1
>+TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST1
> TP_IFACE_CONNECTION_INTERFACE_CONTACTS
> TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS
> TP_IFACE_CONNECTION_INTERFACE_REQUESTS
> TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS
>-TP_IFACE_CONNECTION_INTERFACE_PRESENCE
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE
>-TP_IFACE_CONNECTION_INTERFACE_LOCATION
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION
>-TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT
>-TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION
>-TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION
>+TP_IFACE_CONNECTION_INTERFACE_PRESENCE1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE1
>+TP_IFACE_CONNECTION_INTERFACE_LOCATION1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION1
>+TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT1
>+TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1
>+TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION1
> TP_IFACE_CHANNEL
> TP_IFACE_QUARK_CHANNEL
>-TP_IFACE_CHANNEL_TYPE_CALL
>-TP_IFACE_QUARK_CHANNEL_TYPE_CALL
>-TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH
>-TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH
>-TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER
>-TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER
>-TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION
>-TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION
>-TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION
>-TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION
>-TP_IFACE_CHANNEL_TYPE_ROOM_LIST
>-TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST
>+TP_IFACE_CHANNEL_TYPE_CALL1
>+TP_IFACE_QUARK_CHANNEL_TYPE_CALL1
>+TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1
>+TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH1
>+TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1
>+TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER1
>+TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1
>+TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1
>+TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1
>+TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION1
>+TP_IFACE_CHANNEL_TYPE_ROOM_LIST1
>+TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST1
> TP_IFACE_CHANNEL_TYPE_TEXT
> TP_IFACE_QUARK_CHANNEL_TYPE_TEXT
>-TP_IFACE_CHANNEL_INTERFACE_TUBE
>-TP_IFACE_CHANNEL_TYPE_DBUS_TUBE
>-TP_IFACE_CHANNEL_TYPE_STREAM_TUBE
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE
>-TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE
>-TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE
>-TP_IFACE_CHANNEL_INTERFACE_ANONYMITY
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY
>-TP_IFACE_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION
>-TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE
>-TP_IFACE_CHANNEL_INTERFACE_CONFERENCE
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE
>-TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE
>-TP_IFACE_CHANNEL_INTERFACE_DTMF
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF
>-TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA
>-TP_IFACE_CHANNEL_INTERFACE_GROUP
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP
>-TP_IFACE_CHANNEL_INTERFACE_HOLD
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD
>-TP_IFACE_CHANNEL_INTERFACE_PASSWORD
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD
>-TP_IFACE_CHANNEL_INTERFACE_ROOM
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM
>-TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG
>-TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION
>-TP_IFACE_CHANNEL_INTERFACE_SECURABLE
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_SECURABLE
>-TP_IFACE_CHANNEL_INTERFACE_SMS
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS
>-TP_IFACE_CHANNEL_INTERFACE_SUBJECT
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT
>-TP_IFACE_CHANNEL_INTERFACE_SERVICE_POINT
>-TP_IFACE_QUARK_CHANNEL_INTERFACE_SERVICE_POINT
>+TP_IFACE_CHANNEL_INTERFACE_TUBE1
>+TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1
>+TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE1
>+TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE1
>+TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE1
>+TP_IFACE_CHANNEL_INTERFACE_ANONYMITY1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY1
>+TP_IFACE_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1
>+TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE1
>+TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE1
>+TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE1
>+TP_IFACE_CHANNEL_INTERFACE_DTMF1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF1
>+TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
>+TP_IFACE_CHANNEL_INTERFACE_GROUP1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1
>+TP_IFACE_CHANNEL_INTERFACE_HOLD1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD1
>+TP_IFACE_CHANNEL_INTERFACE_PASSWORD1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD1
>+TP_IFACE_CHANNEL_INTERFACE_ROOM1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM1
>+TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG1
>+TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION1
>+TP_IFACE_CHANNEL_INTERFACE_SECURABLE1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_SECURABLE1
>+TP_IFACE_CHANNEL_INTERFACE_SMS1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS1
>+TP_IFACE_CHANNEL_INTERFACE_SUBJECT1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT1
>+TP_IFACE_CHANNEL_INTERFACE_SERVICE_POINT1
>+TP_IFACE_QUARK_CHANNEL_INTERFACE_SERVICE_POINT1
> TP_IFACE_CHANNEL_DISPATCHER
> TP_IFACE_QUARK_CHANNEL_DISPATCHER
>-TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
>-TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
>+TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1
>+TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1
> TP_IFACE_CHANNEL_DISPATCH_OPERATION
> TP_IFACE_QUARK_CHANNEL_DISPATCH_OPERATION
> TP_IFACE_CHANNEL_REQUEST
>@@ -2417,30 +2417,30 @@ TP_IFACE_CLIENT_OBSERVER
> TP_IFACE_QUARK_CLIENT_OBSERVER
> TP_IFACE_CLIENT_INTERFACE_REQUESTS
> TP_IFACE_QUARK_CLIENT_INTERFACE_REQUESTS
>-TP_IFACE_CALL_CONTENT
>-TP_IFACE_QUARK_CALL_CONTENT
>-TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA
>-TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_MEDIA
>-TP_IFACE_CALL_CONTENT_INTERFACE_VIDEO_CONTROL
>-TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_VIDEO_CONTROL
>-TP_IFACE_CALL_CONTENT_INTERFACE_AUDIO_CONTROL
>-TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_AUDIO_CONTROL
>-TP_IFACE_CALL_CONTENT_INTERFACE_DTMF
>-TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF
>-TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION
>-TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION
>-TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS
>-TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS
>-TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
>-TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK
>-TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
>-TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS
>-TP_IFACE_CALL_STREAM
>-TP_IFACE_QUARK_CALL_STREAM
>-TP_IFACE_CALL_STREAM_ENDPOINT
>-TP_IFACE_QUARK_CALL_STREAM_ENDPOINT
>-TP_IFACE_CALL_STREAM_INTERFACE_MEDIA
>-TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA
>+TP_IFACE_CALL1_CONTENT
>+TP_IFACE_QUARK_CALL1_CONTENT
>+TP_IFACE_CALL1_CONTENT_INTERFACE_MEDIA
>+TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_MEDIA
>+TP_IFACE_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1
>+TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1
>+TP_IFACE_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1
>+TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1
>+TP_IFACE_CALL1_CONTENT_INTERFACE_DTMF1
>+TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_DTMF1
>+TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION
>+TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION
>+TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1
>+TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1
>+TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1
>+TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1
>+TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1
>+TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1
>+TP_IFACE_CALL1_STREAM
>+TP_IFACE_QUARK_CALL1_STREAM
>+TP_IFACE_CALL1_STREAM_ENDPOINT
>+TP_IFACE_QUARK_CALL1_STREAM_ENDPOINT
>+TP_IFACE_CALL1_STREAM_INTERFACE_MEDIA
>+TP_IFACE_QUARK_CALL1_STREAM_INTERFACE_MEDIA
> TP_PROP_ACCOUNT_AUTOMATIC_PRESENCE
> TP_PROP_ACCOUNT_CHANGING_PRESENCE
> TP_PROP_ACCOUNT_CONNECTION
>@@ -2455,12 +2455,12 @@ TP_PROP_ACCOUNT_ENABLED
> TP_PROP_ACCOUNT_HAS_BEEN_ONLINE
> TP_PROP_ACCOUNT_ICON
> TP_PROP_ACCOUNT_INTERFACES
>-TP_PROP_ACCOUNT_INTERFACE_ADDRESSING_URI_SCHEMES
>-TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR
>-TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_IDENTIFIER
>-TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER
>-TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_RESTRICTIONS
>-TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_SPECIFIC_INFORMATION
>+TP_PROP_ACCOUNT_INTERFACE_ADDRESSING1_URI_SCHEMES
>+TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR
>+TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_IDENTIFIER
>+TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_PROVIDER
>+TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_RESTRICTIONS
>+TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_SPECIFIC_INFORMATION
> TP_PROP_ACCOUNT_MANAGER_INTERFACES
> TP_PROP_ACCOUNT_MANAGER_UNUSABLE_ACCOUNTS
> TP_PROP_ACCOUNT_MANAGER_SUPPORTED_ACCOUNT_PROPERTIES
>@@ -2476,67 +2476,67 @@ TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_CHAIN_DATA
> TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_TYPE
> TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_REJECTIONS
> TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_STATE
>-TP_PROP_CALL_CONTENT_DISPOSITION
>-TP_PROP_CALL_CONTENT_INTERFACES
>-TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_EVENT
>-TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_STATE
>-TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_LOCAL_MEDIA_DESCRIPTIONS
>-TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_MEDIA_DESCRIPTION_OFFER
>-TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_PACKETIZATION
>-TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_REMOTE_MEDIA_DESCRIPTIONS
>-TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_BITRATE
>-TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_FRAMERATE
>-TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MANUAL_KEY_FRAMES
>-TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MTU
>-TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_VIDEO_RESOLUTION
>-TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_INPUT_VOLUME
>-TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_OUTPUT_VOLUME
>-TP_PROP_CALL_CONTENT_INTERFACE_DTMF_CURRENTLY_SENDING_TONES
>-TP_PROP_CALL_CONTENT_INTERFACE_DTMF_DEFERRED_TONES
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_DLRR_MAX_SIZE
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_DUPLICATE_RLE_MAX_SIZE
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_ENABLE_METRICS
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_LOSS_RLE_MAX_SIZE
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_PACKET_RECEIPT_TIMES_MAX_SIZE
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_RTT_MODE
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS_STATISTICS_FLAGS
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_DOES_AVPF
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_FEEDBACK_MESSAGES
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS_HEADER_EXTENSIONS
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT
>-TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_SSRCS
>-TP_PROP_CALL_CONTENT_NAME
>-TP_PROP_CALL_CONTENT_STREAMS
>-TP_PROP_CALL_CONTENT_TYPE
>-TP_PROP_CALL_STREAM_CAN_REQUEST_RECEIVING
>-TP_PROP_CALL_STREAM_ENDPOINT_CONTROLLING
>-TP_PROP_CALL_STREAM_ENDPOINT_ENDPOINT_STATE
>-TP_PROP_CALL_STREAM_ENDPOINT_IS_ICE_LITE
>-TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CANDIDATES
>-TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CREDENTIALS
>-TP_PROP_CALL_STREAM_ENDPOINT_SELECTED_CANDIDATE_PAIRS
>-TP_PROP_CALL_STREAM_ENDPOINT_TRANSPORT
>-TP_PROP_CALL_STREAM_INTERFACES
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ENDPOINTS
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_HAS_SERVER_INFO
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ICE_RESTART_PENDING
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CANDIDATES
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CREDENTIALS
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RECEIVING_STATE
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RELAY_INFO
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_SENDING_STATE
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_STUN_SERVERS
>-TP_PROP_CALL_STREAM_INTERFACE_MEDIA_TRANSPORT
>-TP_PROP_CALL_STREAM_LOCAL_SENDING_STATE
>-TP_PROP_CALL_STREAM_REMOTE_MEMBERS
>-TP_PROP_CALL_STREAM_REMOTE_MEMBER_IDENTIFIERS
>+TP_PROP_CALL1_CONTENT_DISPOSITION
>+TP_PROP_CALL1_CONTENT_INTERFACES
>+TP_PROP_CALL1_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_EVENT
>+TP_PROP_CALL1_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_STATE
>+TP_PROP_CALL1_CONTENT_INTERFACE_MEDIA_LOCAL_MEDIA_DESCRIPTIONS
>+TP_PROP_CALL1_CONTENT_INTERFACE_MEDIA_MEDIA_DESCRIPTION_OFFER
>+TP_PROP_CALL1_CONTENT_INTERFACE_MEDIA_PACKETIZATION
>+TP_PROP_CALL1_CONTENT_INTERFACE_MEDIA_REMOTE_MEDIA_DESCRIPTIONS
>+TP_PROP_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1_BITRATE
>+TP_PROP_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1_FRAMERATE
>+TP_PROP_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1_MANUAL_KEY_FRAMES
>+TP_PROP_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1_MTU
>+TP_PROP_CALL1_CONTENT_INTERFACE_VIDEO_CONTROL1_VIDEO_RESOLUTION
>+TP_PROP_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1_REQUESTED_INPUT_VOLUME
>+TP_PROP_CALL1_CONTENT_INTERFACE_AUDIO_CONTROL1_REQUESTED_OUTPUT_VOLUME
>+TP_PROP_CALL1_CONTENT_INTERFACE_DTMF1_CURRENTLY_SENDING_TONES
>+TP_PROP_CALL1_CONTENT_INTERFACE_DTMF1_DEFERRED_TONES
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACES
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_DLRR_MAX_SIZE
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_DUPLICATE_RLE_MAX_SIZE
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_ENABLE_METRICS
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_LOSS_RLE_MAX_SIZE
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_PACKET_RECEIPT_TIMES_MAX_SIZE
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_RTT_MODE
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1_STATISTICS_FLAGS
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_DOES_AVPF
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1_FEEDBACK_MESSAGES
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1_HEADER_EXTENSIONS
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT
>+TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_SSRCS
>+TP_PROP_CALL1_CONTENT_NAME
>+TP_PROP_CALL1_CONTENT_STREAMS
>+TP_PROP_CALL1_CONTENT_TYPE
>+TP_PROP_CALL1_STREAM_CAN_REQUEST_RECEIVING
>+TP_PROP_CALL1_STREAM_ENDPOINT_CONTROLLING
>+TP_PROP_CALL1_STREAM_ENDPOINT_ENDPOINT_STATE
>+TP_PROP_CALL1_STREAM_ENDPOINT_IS_ICE_LITE
>+TP_PROP_CALL1_STREAM_ENDPOINT_REMOTE_CANDIDATES
>+TP_PROP_CALL1_STREAM_ENDPOINT_REMOTE_CREDENTIALS
>+TP_PROP_CALL1_STREAM_ENDPOINT_SELECTED_CANDIDATE_PAIRS
>+TP_PROP_CALL1_STREAM_ENDPOINT_TRANSPORT
>+TP_PROP_CALL1_STREAM_INTERFACES
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_ENDPOINTS
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_HAS_SERVER_INFO
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_ICE_RESTART_PENDING
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_LOCAL_CANDIDATES
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_LOCAL_CREDENTIALS
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_RECEIVING_STATE
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_RELAY_INFO
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_SENDING_STATE
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_STUN_SERVERS
>+TP_PROP_CALL1_STREAM_INTERFACE_MEDIA_TRANSPORT
>+TP_PROP_CALL1_STREAM_LOCAL_SENDING_STATE
>+TP_PROP_CALL1_STREAM_REMOTE_MEMBERS
>+TP_PROP_CALL1_STREAM_REMOTE_MEMBER_IDENTIFIERS
> TP_PROP_CHANNEL_CHANNEL_TYPE
> TP_PROP_CHANNEL_DISPATCHER_INTERFACES
>-TP_PROP_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_DISPATCH_OPERATIONS
>+TP_PROP_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1_DISPATCH_OPERATIONS
> TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT
> TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNELS
> TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION
>@@ -2545,75 +2545,75 @@ TP_PROP_CHANNEL_DISPATCH_OPERATION_POSSIBLE_HANDLERS
> TP_PROP_CHANNEL_INITIATOR_HANDLE
> TP_PROP_CHANNEL_INITIATOR_ID
> TP_PROP_CHANNEL_INTERFACES
>-TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY
>-TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES
>-TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMOUS_ID
>-TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAN_RETRY_CAPTCHA
>-TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR
>-TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR_DETAILS
>-TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_STATUS
>-TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES
>-TP_PROP_CHANNEL_INTERFACE_CONFERENCE_CHANNELS
>-TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS
>-TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_HANDLES
>-TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS
>-TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INVITATION_MESSAGE
>-TP_PROP_CHANNEL_INTERFACE_CONFERENCE_ORIGINAL_CHANNELS
>-TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES
>-TP_PROP_CHANNEL_INTERFACE_DTMF_DEFERRED_TONES
>-TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES
>-TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME
>-TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA
>-TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS
>-TP_PROP_CHANNEL_INTERFACE_GROUP_HANDLE_OWNERS
>-TP_PROP_CHANNEL_INTERFACE_GROUP_LOCAL_PENDING_MEMBERS
>-TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBERS
>-TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBER_IDENTIFIERS
>-TP_PROP_CHANNEL_INTERFACE_GROUP_REMOTE_PENDING_MEMBERS
>-TP_PROP_CHANNEL_INTERFACE_GROUP_SELF_HANDLE
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_ANONYMOUS
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CAN_UPDATE_CONFIGURATION
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CONFIGURATION_RETRIEVED
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_DESCRIPTION
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_INVITEONLY
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_LIMIT
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MODERATED
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MUTABLE_PROPERTIES
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_HINT
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_PROTECTED
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PERSISTENT
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PRIVATE
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_TITLE
>-TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME
>-TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CREATION_TIMESTAMP
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR
>-TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR_HANDLE
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AUTHORIZATION_IDENTITY
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_CAN_TRY_AGAIN
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_REALM
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_USERNAME
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_HAS_INITIAL_DATA
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_ERROR
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_ERROR_DETAILS
>-TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_STATUS
>-TP_PROP_CHANNEL_INTERFACE_SECURABLE_ENCRYPTED
>-TP_PROP_CHANNEL_INTERFACE_SECURABLE_VERIFIED
>-TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_CURRENT_SERVICE_POINT
>-TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_INITIAL_SERVICE_POINT
>-TP_PROP_CHANNEL_INTERFACE_SMS_FLASH
>-TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL
>-TP_PROP_CHANNEL_INTERFACE_SUBJECT_ACTOR
>-TP_PROP_CHANNEL_INTERFACE_SUBJECT_ACTOR_HANDLE
>-TP_PROP_CHANNEL_INTERFACE_SUBJECT_CAN_SET
>-TP_PROP_CHANNEL_INTERFACE_SUBJECT_SUBJECT
>-TP_PROP_CHANNEL_INTERFACE_SUBJECT_TIMESTAMP
>-TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS
>-TP_PROP_CHANNEL_INTERFACE_TUBE_STATE
>-TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD
>+TP_PROP_CHANNEL_INTERFACE_ANONYMITY1_ANONYMITY_MANDATORY
>+TP_PROP_CHANNEL_INTERFACE_ANONYMITY1_ANONYMITY_MODES
>+TP_PROP_CHANNEL_INTERFACE_ANONYMITY1_ANONYMOUS_ID
>+TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1_CAN_RETRY_CAPTCHA
>+TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1_CAPTCHA_ERROR
>+TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1_CAPTCHA_ERROR_DETAILS
>+TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1_CAPTCHA_STATUS
>+TP_PROP_CHANNEL_INTERFACE_CHAT_STATE1_CHAT_STATES
>+TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_CHANNELS
>+TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_CHANNELS
>+TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_HANDLES
>+TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_IDS
>+TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INVITATION_MESSAGE
>+TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_ORIGINAL_CHANNELS
>+TP_PROP_CHANNEL_INTERFACE_DTMF1_CURRENTLY_SENDING_TONES
>+TP_PROP_CHANNEL_INTERFACE_DTMF1_DEFERRED_TONES
>+TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES
>+TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME
>+TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_METADATA
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_GROUP_FLAGS
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_HANDLE_OWNERS
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_LOCAL_PENDING_MEMBERS
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_MEMBERS
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_MEMBER_IDENTIFIERS
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_REMOTE_PENDING_MEMBERS
>+TP_PROP_CHANNEL_INTERFACE_GROUP1_SELF_HANDLE
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_ANONYMOUS
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_CAN_UPDATE_CONFIGURATION
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_CONFIGURATION_RETRIEVED
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_DESCRIPTION
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_INVITEONLY
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_LIMIT
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_MODERATED
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_MUTABLE_PROPERTIES
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_PASSWORD
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_PASSWORD_HINT
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_PASSWORD_PROTECTED
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_PERSISTENT
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_PRIVATE
>+TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG1_TITLE
>+TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME
>+TP_PROP_CHANNEL_INTERFACE_ROOM1_SERVER
>+TP_PROP_CHANNEL_INTERFACE_ROOM1_CREATION_TIMESTAMP
>+TP_PROP_CHANNEL_INTERFACE_ROOM1_CREATOR
>+TP_PROP_CHANNEL_INTERFACE_ROOM1_CREATOR_HANDLE
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_AUTHORIZATION_IDENTITY
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_AVAILABLE_MECHANISMS
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_CAN_TRY_AGAIN
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_DEFAULT_REALM
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_DEFAULT_USERNAME
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_HAS_INITIAL_DATA
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_MAY_SAVE_RESPONSE
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_SASL_ERROR
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_SASL_ERROR_DETAILS
>+TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_SASL_STATUS
>+TP_PROP_CHANNEL_INTERFACE_SECURABLE1_ENCRYPTED
>+TP_PROP_CHANNEL_INTERFACE_SECURABLE1_VERIFIED
>+TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT1_CURRENT_SERVICE_POINT
>+TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT1_INITIAL_SERVICE_POINT
>+TP_PROP_CHANNEL_INTERFACE_SMS1_FLASH
>+TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL
>+TP_PROP_CHANNEL_INTERFACE_SUBJECT1_ACTOR
>+TP_PROP_CHANNEL_INTERFACE_SUBJECT1_ACTOR_HANDLE
>+TP_PROP_CHANNEL_INTERFACE_SUBJECT1_CAN_SET
>+TP_PROP_CHANNEL_INTERFACE_SUBJECT1_SUBJECT
>+TP_PROP_CHANNEL_INTERFACE_SUBJECT1_TIMESTAMP
>+TP_PROP_CHANNEL_INTERFACE_TUBE1_PARAMETERS
>+TP_PROP_CHANNEL_INTERFACE_TUBE1_STATE
>+TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION1_AUTHENTICATION_METHOD
> TP_PROP_CHANNEL_REQUESTED
> TP_PROP_CHANNEL_REQUEST_ACCOUNT
> TP_PROP_CHANNEL_REQUEST_HINTS
>@@ -2624,45 +2624,45 @@ TP_PROP_CHANNEL_REQUEST_USER_ACTION_TIME
> TP_PROP_CHANNEL_TARGET_HANDLE
> TP_PROP_CHANNEL_TARGET_HANDLE_TYPE
> TP_PROP_CHANNEL_TARGET_ID
>-TP_PROP_CHANNEL_TYPE_CALL_CALL_FLAGS
>-TP_PROP_CHANNEL_TYPE_CALL_CALL_MEMBERS
>-TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE
>-TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_DETAILS
>-TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_REASON
>-TP_PROP_CHANNEL_TYPE_CALL_CONTENTS
>-TP_PROP_CHANNEL_TYPE_CALL_HARDWARE_STREAMING
>-TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO
>-TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME
>-TP_PROP_CHANNEL_TYPE_CALL_INITIAL_TRANSPORT
>-TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO
>-TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME
>-TP_PROP_CHANNEL_TYPE_CALL_MEMBER_IDENTIFIERS
>-TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS
>-TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_AVAILABLE_SEARCH_KEYS
>-TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT
>-TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SEARCH_STATE
>-TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER
>-TP_PROP_CHANNEL_TYPE_DBUS_TUBE_DBUS_NAMES
>-TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME
>-TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_AVAILABLE_SOCKET_TYPES
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH
>-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_FILENAME
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_STATE
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES
>-TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI
>-TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER
>-TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME
>-TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_REFERENCE_IDENTITIES
>-TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_SERVER_CERTIFICATE
>-TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE
>-TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SUPPORTED_SOCKET_TYPES
>+TP_PROP_CHANNEL_TYPE_CALL1_CALL_FLAGS
>+TP_PROP_CHANNEL_TYPE_CALL1_CALL_MEMBERS
>+TP_PROP_CHANNEL_TYPE_CALL1_CALL_STATE
>+TP_PROP_CHANNEL_TYPE_CALL1_CALL_STATE_DETAILS
>+TP_PROP_CHANNEL_TYPE_CALL1_CALL_STATE_REASON
>+TP_PROP_CHANNEL_TYPE_CALL1_CONTENTS
>+TP_PROP_CHANNEL_TYPE_CALL1_HARDWARE_STREAMING
>+TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO
>+TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME
>+TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TRANSPORT
>+TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO
>+TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME
>+TP_PROP_CHANNEL_TYPE_CALL1_MEMBER_IDENTIFIERS
>+TP_PROP_CHANNEL_TYPE_CALL1_MUTABLE_CONTENTS
>+TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_AVAILABLE_SEARCH_KEYS
>+TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_LIMIT
>+TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_SEARCH_STATE
>+TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_SERVER
>+TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_DBUS_NAMES
>+TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME
>+TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SUPPORTED_ACCESS_CONTROLS
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_AVAILABLE_SOCKET_TYPES
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH_TYPE
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_STATE
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_TRANSFERRED_BYTES
>+TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI
>+TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER
>+TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION1_HOSTNAME
>+TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION1_REFERENCE_IDENTITIES
>+TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION1_SERVER_CERTIFICATE
>+TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE
>+TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SUPPORTED_SOCKET_TYPES
> TP_PROP_CHANNEL_TYPE_TEXT_DELIVERY_REPORTING_SUPPORT
> TP_PROP_CHANNEL_TYPE_TEXT_MESSAGE_PART_SUPPORT_FLAGS
> TP_PROP_CHANNEL_TYPE_TEXT_MESSAGE_TYPES
>@@ -2677,135 +2677,135 @@ TP_PROP_CLIENT_INTERFACES
> TP_PROP_CLIENT_OBSERVER_DELAY_APPROVERS
> TP_PROP_CLIENT_OBSERVER_OBSERVER_CHANNEL_FILTER
> TP_PROP_CLIENT_OBSERVER_RECOVER
>-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_MAXIMUM_AVATAR_BYTES
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH
>-TP_PROP_CONNECTION_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES
>-TP_PROP_CONNECTION_INTERFACE_BALANCE_ACCOUNT_BALANCE
>-TP_PROP_CONNECTION_INTERFACE_BALANCE_MANAGE_CREDIT_URI
>-TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI
>-TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_NATIONAL_CHARACTER_SET
>-TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET
>-TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE
>-TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_VALIDITY_PERIOD
>-TP_PROP_CONNECTION_INTERFACE_CELLULAR_OVERRIDE_MESSAGE_SERVICE_CENTRE
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_BLOCKING_CONTACT_BLOCKING_CAPABILITIES
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_DISJOINT_GROUPS
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUP_STORAGE
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_CONTACT_INFO_FLAGS
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_SUPPORTED_FIELDS
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CAN_CHANGE_CONTACT_LIST
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_DOWNLOAD_AT_CONNECTION
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_REQUEST_USES_MESSAGE
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_PERSISTS
>-TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_STATE
>-TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL
>-TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL_TYPES
>-TP_PROP_CONNECTION_INTERFACE_LOCATION_SUPPORTED_LOCATION_FEATURES
>-TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_ADDRESS
>-TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_NOTIFICATION_FLAGS
>-TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAILS
>-TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAIL_COUNT
>-TP_PROP_CONNECTION_INTERFACE_POWER_SAVING_POWER_SAVING_ACTIVE
>+TP_PROP_CONNECTION_INTERFACE_ALIASING1_ALIAS_FLAGS
>+TP_PROP_CONNECTION_INTERFACE_ANONYMITY1_ANONYMITY_MANDATORY
>+TP_PROP_CONNECTION_INTERFACE_ANONYMITY1_ANONYMITY_MODES
>+TP_PROP_CONNECTION_INTERFACE_ANONYMITY1_SUPPORTED_ANONYMITY_MODES
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_MAXIMUM_AVATAR_BYTES
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_MAXIMUM_AVATAR_HEIGHT
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_MAXIMUM_AVATAR_WIDTH
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_MINIMUM_AVATAR_HEIGHT
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_MINIMUM_AVATAR_WIDTH
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_HEIGHT
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_WIDTH
>+TP_PROP_CONNECTION_INTERFACE_AVATARS1_SUPPORTED_AVATAR_MIME_TYPES
>+TP_PROP_CONNECTION_INTERFACE_BALANCE1_ACCOUNT_BALANCE
>+TP_PROP_CONNECTION_INTERFACE_BALANCE1_MANAGE_CREDIT_URI
>+TP_PROP_CONNECTION_INTERFACE_CELLULAR1_IMSI
>+TP_PROP_CONNECTION_INTERFACE_CELLULAR1_MESSAGE_NATIONAL_CHARACTER_SET
>+TP_PROP_CONNECTION_INTERFACE_CELLULAR1_MESSAGE_REDUCED_CHARACTER_SET
>+TP_PROP_CONNECTION_INTERFACE_CELLULAR1_MESSAGE_SERVICE_CENTRE
>+TP_PROP_CONNECTION_INTERFACE_CELLULAR1_MESSAGE_VALIDITY_PERIOD
>+TP_PROP_CONNECTION_INTERFACE_CELLULAR1_OVERRIDE_MESSAGE_SERVICE_CENTRE
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_BLOCKING1_CONTACT_BLOCKING_CAPABILITIES
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS1_DISJOINT_GROUPS
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUP_STORAGE
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO1_CONTACT_INFO_FLAGS
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO1_SUPPORTED_FIELDS
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_CAN_CHANGE_CONTACT_LIST
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_DOWNLOAD_AT_CONNECTION
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_REQUEST_USES_MESSAGE
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_CONTACT_LIST_PERSISTS
>+TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_CONTACT_LIST_STATE
>+TP_PROP_CONNECTION_INTERFACE_LOCATION1_LOCATION_ACCESS_CONTROL
>+TP_PROP_CONNECTION_INTERFACE_LOCATION1_LOCATION_ACCESS_CONTROL_TYPES
>+TP_PROP_CONNECTION_INTERFACE_LOCATION1_SUPPORTED_LOCATION_FEATURES
>+TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION1_MAIL_ADDRESS
>+TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION1_MAIL_NOTIFICATION_FLAGS
>+TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION1_UNREAD_MAILS
>+TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION1_UNREAD_MAIL_COUNT
>+TP_PROP_CONNECTION_INTERFACE_POWER_SAVING1_POWER_SAVING_ACTIVE
> TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS
> TP_PROP_CONNECTION_INTERFACE_REQUESTS_REQUESTABLE_CHANNEL_CLASSES
>-TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT_KNOWN_SERVICE_POINTS
>-TP_PROP_CONNECTION_INTERFACE_PRESENCE_STATUSES
>-TP_PROP_CONNECTION_INTERFACE_PRESENCE_MAXIMUM_STATUS_MESSAGE_LENGTH
>+TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT1_KNOWN_SERVICE_POINTS
>+TP_PROP_CONNECTION_INTERFACE_PRESENCE1_STATUSES
>+TP_PROP_CONNECTION_INTERFACE_PRESENCE1_MAXIMUM_STATUS_MESSAGE_LENGTH
> TP_PROP_CONNECTION_MANAGER_INTERFACES
> TP_PROP_CONNECTION_MANAGER_PROTOCOLS
> TP_PROP_CONNECTION_INTERFACES
> TP_PROP_CONNECTION_SELF_HANDLE
> TP_PROP_CONNECTION_SELF_ID
> TP_PROP_CONNECTION_STATUS
>-TP_PROP_DEBUG_ENABLED
>+TP_PROP_DEBUG1_ENABLED
> TP_PROP_PROTOCOL_AUTHENTICATION_TYPES
> TP_PROP_PROTOCOL_CONNECTION_INTERFACES
> TP_PROP_PROTOCOL_ENGLISH_NAME
> TP_PROP_PROTOCOL_ICON
>-TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_URI_SCHEMES
>-TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_VCARD_FIELDS
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH
>-TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES
>-TP_PROP_PROTOCOL_INTERFACE_PRESENCE_STATUSES
>+TP_PROP_PROTOCOL_INTERFACE_ADDRESSING1_ADDRESSABLE_URI_SCHEMES
>+TP_PROP_PROTOCOL_INTERFACE_ADDRESSING1_ADDRESSABLE_VCARD_FIELDS
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_BYTES
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_HEIGHT
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_WIDTH
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_HEIGHT
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_WIDTH
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_HEIGHT
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_WIDTH
>+TP_PROP_PROTOCOL_INTERFACE_AVATARS1_SUPPORTED_AVATAR_MIME_TYPES
>+TP_PROP_PROTOCOL_INTERFACE_PRESENCE1_STATUSES
> TP_PROP_PROTOCOL_INTERFACES
> TP_PROP_PROTOCOL_PARAMETERS
> TP_PROP_PROTOCOL_REQUESTABLE_CHANNEL_CLASSES
> TP_PROP_PROTOCOL_VCARD_FIELD
> 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_TOKEN
>-TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO_INFO
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST
>-TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE
>-TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION
>-TP_TOKEN_CONNECTION_INTERFACE_PRESENCE_PRESENCE
>-TP_TOKEN_CHANNEL_TYPE_CALL_AUDIO
>-TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P
>-TP_TOKEN_CHANNEL_TYPE_CALL_ICE
>-TP_TOKEN_CHANNEL_TYPE_CALL_SHM
>-TP_TOKEN_CHANNEL_TYPE_CALL_VIDEO
>-TP_TOKEN_CHANNEL_TYPE_CALL_WLM_2009
>+TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING1_ADDRESSES
>+TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING1_URIS
>+TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS
>+TP_TOKEN_CONNECTION_INTERFACE_AVATARS1_TOKEN
>+TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES1_CLIENT_TYPES
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING1_BLOCKED
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1_CAPABILITIES
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO1_INFO
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH_REQUEST
>+TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_SUBSCRIBE
>+TP_TOKEN_CONNECTION_INTERFACE_LOCATION1_LOCATION
>+TP_TOKEN_CONNECTION_INTERFACE_PRESENCE1_PRESENCE
>+TP_TOKEN_CHANNEL_TYPE_CALL1_AUDIO
>+TP_TOKEN_CHANNEL_TYPE_CALL1_GTALK_P2P
>+TP_TOKEN_CHANNEL_TYPE_CALL1_ICE
>+TP_TOKEN_CHANNEL_TYPE_CALL1_SHM
>+TP_TOKEN_CHANNEL_TYPE_CALL1_VIDEO
>+TP_TOKEN_CHANNEL_TYPE_CALL1_WLM_2009
> 
> <SUBSECTION Private>
> tp_iface_quark_account
>-tp_iface_quark_account_interface_addressing
>-tp_iface_quark_account_interface_avatar
>-tp_iface_quark_account_interface_storage
>+tp_iface_quark_account_interface_addressing1
>+tp_iface_quark_account_interface_avatar1
>+tp_iface_quark_account_interface_storage1
> tp_iface_quark_account_manager
> tp_iface_quark_authentication_tls_certificate
> tp_iface_quark_dbus_introspectable
> tp_iface_quark_dbus_peer
> tp_iface_quark_dbus_properties
>-tp_iface_quark_debug
>+tp_iface_quark_debug1
> tp_iface_quark_channel
>-tp_iface_quark_channel_interface_chat_state
>-tp_iface_quark_channel_interface_conference
>-tp_iface_quark_channel_interface_destroyable
>-tp_iface_quark_channel_interface_dtmf
>-tp_iface_quark_channel_interface_file_transfer_metadata
>-tp_iface_quark_channel_interface_group
>-tp_iface_quark_channel_interface_hold
>-tp_iface_quark_channel_interface_password
>-tp_iface_quark_channel_interface_room
>-tp_iface_quark_channel_interface_room_config
>-tp_iface_quark_channel_interface_sasl_authentication
>-tp_iface_quark_channel_interface_securable
>-tp_iface_quark_channel_interface_sms
>-tp_iface_quark_channel_interface_subject
>-tp_iface_quark_channel_type_contact_search
>-tp_iface_quark_channel_type_file_transfer
>-tp_iface_quark_channel_type_room_list
>-tp_iface_quark_channel_type_server_tls_connection
>+tp_iface_quark_channel_interface_chat_state1
>+tp_iface_quark_channel_interface_conference1
>+tp_iface_quark_channel_interface_destroyable1
>+tp_iface_quark_channel_interface_dtmf1
>+tp_iface_quark_channel_interface_file_transfer_metadata1
>+tp_iface_quark_channel_interface_group1
>+tp_iface_quark_channel_interface_hold1
>+tp_iface_quark_channel_interface_password1
>+tp_iface_quark_channel_interface_room1
>+tp_iface_quark_channel_interface_room_config1
>+tp_iface_quark_channel_interface_sasl_authentication1
>+tp_iface_quark_channel_interface_securable1
>+tp_iface_quark_channel_interface_sms1
>+tp_iface_quark_channel_interface_subject1
>+tp_iface_quark_channel_type_contact_search1
>+tp_iface_quark_channel_type_file_transfer1
>+tp_iface_quark_channel_type_room_list1
>+tp_iface_quark_channel_type_server_tls_connection1
> tp_iface_quark_channel_type_text
>-tp_iface_quark_channel_interface_tube
>-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_interface_tube1
>+tp_iface_quark_channel_type_dbus_tube1
>+tp_iface_quark_channel_type_server_authentication1
>+tp_iface_quark_channel_type_stream_tube1
> tp_iface_quark_channel_dispatcher
>-tp_iface_quark_channel_dispatcher_interface_operation_list
>+tp_iface_quark_channel_dispatcher_interface_operation_list1
> tp_iface_quark_channel_dispatch_operation
> tp_iface_quark_channel_request
> tp_iface_quark_client
>@@ -2814,47 +2814,47 @@ tp_iface_quark_client_handler
> tp_iface_quark_client_interface_requests
> tp_iface_quark_client_observer
> tp_iface_quark_connection
>-tp_iface_quark_connection_interface_aliasing
>-tp_iface_quark_connection_interface_avatars
>-tp_iface_quark_connection_interface_balance
>-tp_iface_quark_connection_interface_cellular
>-tp_iface_quark_connection_interface_client_types
>+tp_iface_quark_connection_interface_aliasing1
>+tp_iface_quark_connection_interface_avatars1
>+tp_iface_quark_connection_interface_balance1
>+tp_iface_quark_connection_interface_cellular1
>+tp_iface_quark_connection_interface_client_types1
> tp_iface_quark_connection_interface_contacts
>-tp_iface_quark_connection_interface_contact_blocking
>-tp_iface_quark_connection_interface_contact_capabilities
>-tp_iface_quark_connection_interface_contact_groups
>-tp_iface_quark_connection_interface_contact_info
>-tp_iface_quark_connection_interface_contact_list
>-tp_iface_quark_connection_interface_mail_notification
>+tp_iface_quark_connection_interface_contact_blocking1
>+tp_iface_quark_connection_interface_contact_capabilities1
>+tp_iface_quark_connection_interface_contact_groups1
>+tp_iface_quark_connection_interface_contact_info1
>+tp_iface_quark_connection_interface_contact_list1
>+tp_iface_quark_connection_interface_mail_notification1
> tp_iface_quark_connection_interface_requests
>-tp_iface_quark_connection_interface_power_saving
>-tp_iface_quark_connection_interface_presence
>-tp_iface_quark_connection_interface_location
>+tp_iface_quark_connection_interface_power_saving1
>+tp_iface_quark_connection_interface_presence1
>+tp_iface_quark_connection_interface_location1
> tp_iface_quark_connection_manager
> tp_iface_quark_dbus_daemon
> tp_iface_quark_protocol
>-tp_iface_quark_protocol_interface_addressing
>-tp_iface_quark_protocol_interface_avatars
>-tp_iface_quark_protocol_interface_presence
>-tp_iface_quark_channel_interface_anonymity
>-tp_iface_quark_channel_interface_service_point
>-tp_iface_quark_connection_interface_anonymity
>-tp_iface_quark_connection_interface_service_point
>-tp_iface_quark_channel_interface_captcha_authentication
>-tp_iface_quark_connection_interface_addressing
>-tp_iface_quark_call_content
>-tp_iface_quark_call_content_interface_media
>-tp_iface_quark_call_content_interface_video_control
>-tp_iface_quark_call_content_interface_audio_control
>-tp_iface_quark_call_content_interface_dtmf
>-tp_iface_quark_call_content_media_description
>-tp_iface_quark_call_content_media_description_interface_rtcp_extended_reports
>-tp_iface_quark_call_content_media_description_interface_rtcp_feedback
>-tp_iface_quark_call_content_media_description_interface_rtp_header_extensions
>-tp_iface_quark_call_stream
>-tp_iface_quark_call_stream_endpoint
>-tp_iface_quark_call_stream_interface_media
>-tp_iface_quark_channel_type_call
>+tp_iface_quark_protocol_interface_addressing1
>+tp_iface_quark_protocol_interface_avatars1
>+tp_iface_quark_protocol_interface_presence1
>+tp_iface_quark_channel_interface_anonymity1
>+tp_iface_quark_channel_interface_service_point1
>+tp_iface_quark_connection_interface_anonymity1
>+tp_iface_quark_connection_interface_service_point1
>+tp_iface_quark_channel_interface_captcha_authentication1
>+tp_iface_quark_connection_interface_addressing1
>+tp_iface_quark_call1_content
>+tp_iface_quark_call1_content_interface_media
>+tp_iface_quark_call1_content_interface_video_control1
>+tp_iface_quark_call1_content_interface_audio_control1
>+tp_iface_quark_call1_content_interface_dtmf1
>+tp_iface_quark_call1_content_media_description
>+tp_iface_quark_call1_content_media_description_interface_rtcp_extended_reports1
>+tp_iface_quark_call1_content_media_description_interface_rtcp_feedback1
>+tp_iface_quark_call1_content_media_description_interface_rtp_header_extensions1
>+tp_iface_quark_call1_stream
>+tp_iface_quark_call1_stream_endpoint
>+tp_iface_quark_call1_stream_interface_media
>+tp_iface_quark_channel_type_call1
> </SECTION>
> 
> <SECTION>
>@@ -3052,8 +3052,8 @@ tp_cli_channel_callback_for_close
> tp_cli_channel_connect_to_closed
> tp_cli_channel_signal_callback_closed
> <SUBSECTION>
>-tp_cli_channel_interface_destroyable_call_destroy
>-tp_cli_channel_interface_destroyable_callback_for_destroy
>+tp_cli_channel_interface_destroyable1_call_destroy
>+tp_cli_channel_interface_destroyable1_callback_for_destroy
> <SUBSECTION Standard>
> tp_cli_channel_add_signals
> </SECTION>
>@@ -3062,25 +3062,25 @@ tp_cli_channel_add_signals
> <FILE>channel-group</FILE>
> <TITLE>channel-group</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_interface_group_call_add_members
>-tp_cli_channel_interface_group_call_remove_members
>-tp_cli_channel_interface_group_callback_for_add_members
>-tp_cli_channel_interface_group_callback_for_remove_members
>-tp_cli_channel_interface_group_connect_to_group_flags_changed
>-tp_cli_channel_interface_group_connect_to_members_changed
>-tp_cli_channel_interface_group_signal_callback_group_flags_changed
>-tp_cli_channel_interface_group_signal_callback_members_changed
>-tp_cli_channel_interface_group_connect_to_handle_owners_changed
>-tp_cli_channel_interface_group_signal_callback_handle_owners_changed
>-tp_cli_channel_interface_group_connect_to_self_contact_changed
>-tp_cli_channel_interface_group_signal_callback_self_contact_changed
>-tp_svc_channel_interface_group_emit_self_contact_changed
>+tp_cli_channel_interface_group1_call_add_members
>+tp_cli_channel_interface_group1_call_remove_members
>+tp_cli_channel_interface_group1_callback_for_add_members
>+tp_cli_channel_interface_group1_callback_for_remove_members
>+tp_cli_channel_interface_group1_connect_to_group_flags_changed
>+tp_cli_channel_interface_group1_connect_to_members_changed
>+tp_cli_channel_interface_group1_signal_callback_group_flags_changed
>+tp_cli_channel_interface_group1_signal_callback_members_changed
>+tp_cli_channel_interface_group1_connect_to_handle_owners_changed
>+tp_cli_channel_interface_group1_signal_callback_handle_owners_changed
>+tp_cli_channel_interface_group1_connect_to_self_contact_changed
>+tp_cli_channel_interface_group1_signal_callback_self_contact_changed
>+tp_svc_channel_interface_group1_emit_self_contact_changed
> 
> <SUBSECTION>
>-tp_cli_channel_interface_conference_connect_to_channel_merged
>-tp_cli_channel_interface_conference_connect_to_channel_removed
>-tp_cli_channel_interface_conference_signal_callback_channel_merged
>-tp_cli_channel_interface_conference_signal_callback_channel_removed
>+tp_cli_channel_interface_conference1_connect_to_channel_merged
>+tp_cli_channel_interface_conference1_connect_to_channel_removed
>+tp_cli_channel_interface_conference1_signal_callback_channel_merged
>+tp_cli_channel_interface_conference1_signal_callback_channel_removed
> </SECTION>
> 
> <SECTION>
>@@ -3098,22 +3098,22 @@ tp_cli_channel_type_text_signal_callback_message_sent
> tp_cli_channel_type_text_connect_to_pending_messages_removed
> tp_cli_channel_type_text_signal_callback_pending_messages_removed
> <SUBSECTION>
>-tp_cli_channel_interface_chat_state_call_set_chat_state
>-tp_cli_channel_interface_chat_state_callback_for_set_chat_state
>-tp_cli_channel_interface_chat_state_connect_to_chat_state_changed
>-tp_cli_channel_interface_chat_state_signal_callback_chat_state_changed
>+tp_cli_channel_interface_chat_state1_call_set_chat_state
>+tp_cli_channel_interface_chat_state1_callback_for_set_chat_state
>+tp_cli_channel_interface_chat_state1_connect_to_chat_state_changed
>+tp_cli_channel_interface_chat_state1_signal_callback_chat_state_changed
> <SUBSECTION>
>-tp_cli_channel_interface_password_call_get_password_flags
>-tp_cli_channel_interface_password_call_provide_password
>-tp_cli_channel_interface_password_callback_for_get_password_flags
>-tp_cli_channel_interface_password_callback_for_provide_password
>-tp_cli_channel_interface_password_connect_to_password_flags_changed
>-tp_cli_channel_interface_password_signal_callback_password_flags_changed
>+tp_cli_channel_interface_password1_call_get_password_flags
>+tp_cli_channel_interface_password1_call_provide_password
>+tp_cli_channel_interface_password1_callback_for_get_password_flags
>+tp_cli_channel_interface_password1_callback_for_provide_password
>+tp_cli_channel_interface_password1_connect_to_password_flags_changed
>+tp_cli_channel_interface_password1_signal_callback_password_flags_changed
> <SUBSECTION>
>-tp_cli_channel_interface_sms_connect_to_sms_channel_changed
>-tp_cli_channel_interface_sms_signal_callback_sms_channel_changed
>-tp_cli_channel_interface_sms_call_get_sms_length
>-tp_cli_channel_interface_sms_callback_for_get_sms_length
>+tp_cli_channel_interface_sms1_connect_to_sms_channel_changed
>+tp_cli_channel_interface_sms1_signal_callback_sms_channel_changed
>+tp_cli_channel_interface_sms1_call_get_sms_length
>+tp_cli_channel_interface_sms1_callback_for_get_sms_length
> </SECTION>
> 
> <SECTION>
>@@ -3121,112 +3121,112 @@ tp_cli_channel_interface_sms_callback_for_get_sms_length
> <TITLE>channel-room</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <SUBSECTION>
>-tp_cli_channel_interface_room_config_call_update_configuration
>-tp_cli_channel_interface_room_config_callback_for_update_configuration
>+tp_cli_channel_interface_room_config1_call_update_configuration
>+tp_cli_channel_interface_room_config1_callback_for_update_configuration
> <SUBSECTION>
>-tp_cli_channel_interface_subject_call_set_subject
>-tp_cli_channel_interface_subject_callback_for_set_subject
>+tp_cli_channel_interface_subject1_call_set_subject
>+tp_cli_channel_interface_subject1_callback_for_set_subject
> </SECTION>
> 
> <SECTION>
> <FILE>channel-file-transfer</FILE>
> <TITLE>channel-file-transfer</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_type_file_transfer_call_accept_file
>-tp_cli_channel_type_file_transfer_call_provide_file
>-tp_cli_channel_type_file_transfer_callback_for_accept_file
>-tp_cli_channel_type_file_transfer_callback_for_provide_file
>-tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed
>-tp_cli_channel_type_file_transfer_connect_to_initial_offset_defined
>-tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed
>-tp_cli_channel_type_file_transfer_connect_to_uri_defined
>-tp_cli_channel_type_file_transfer_signal_callback_file_transfer_state_changed
>-tp_cli_channel_type_file_transfer_signal_callback_initial_offset_defined
>-tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_changed
>-tp_cli_channel_type_file_transfer_signal_callback_uri_defined
>+tp_cli_channel_type_file_transfer1_call_accept_file
>+tp_cli_channel_type_file_transfer1_call_provide_file
>+tp_cli_channel_type_file_transfer1_callback_for_accept_file
>+tp_cli_channel_type_file_transfer1_callback_for_provide_file
>+tp_cli_channel_type_file_transfer1_connect_to_file_transfer_state_changed
>+tp_cli_channel_type_file_transfer1_connect_to_initial_offset_defined
>+tp_cli_channel_type_file_transfer1_connect_to_transferred_bytes_changed
>+tp_cli_channel_type_file_transfer1_connect_to_uri_defined
>+tp_cli_channel_type_file_transfer1_signal_callback_file_transfer_state_changed
>+tp_cli_channel_type_file_transfer1_signal_callback_initial_offset_defined
>+tp_cli_channel_type_file_transfer1_signal_callback_transferred_bytes_changed
>+tp_cli_channel_type_file_transfer1_signal_callback_uri_defined
> </SECTION>
> 
> <SECTION>
> <FILE>channel-media</FILE>
> <TITLE>channel-media</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_interface_dtmf_call_start_tone
>-tp_cli_channel_interface_dtmf_call_stop_tone
>-tp_cli_channel_interface_dtmf_callback_for_start_tone
>-tp_cli_channel_interface_dtmf_callback_for_stop_tone
>-tp_cli_channel_interface_dtmf_call_multiple_tones
>-tp_cli_channel_interface_dtmf_callback_for_multiple_tones
>-tp_cli_channel_interface_dtmf_connect_to_sending_tones
>-tp_cli_channel_interface_dtmf_signal_callback_sending_tones
>-tp_cli_channel_interface_dtmf_connect_to_stopped_tones
>-tp_cli_channel_interface_dtmf_signal_callback_stopped_tones
>-tp_cli_channel_interface_dtmf_connect_to_tones_deferred
>-tp_cli_channel_interface_dtmf_signal_callback_tones_deferred
>-<SUBSECTION>
>-tp_cli_channel_interface_hold_callback_for_get_hold_state
>-tp_cli_channel_interface_hold_call_get_hold_state
>-tp_cli_channel_interface_hold_callback_for_request_hold
>-tp_cli_channel_interface_hold_call_request_hold
>-tp_cli_channel_interface_hold_signal_callback_hold_state_changed
>-tp_cli_channel_interface_hold_connect_to_hold_state_changed
>+tp_cli_channel_interface_dtmf1_call_start_tone
>+tp_cli_channel_interface_dtmf1_call_stop_tone
>+tp_cli_channel_interface_dtmf1_callback_for_start_tone
>+tp_cli_channel_interface_dtmf1_callback_for_stop_tone
>+tp_cli_channel_interface_dtmf1_call_multiple_tones
>+tp_cli_channel_interface_dtmf1_callback_for_multiple_tones
>+tp_cli_channel_interface_dtmf1_connect_to_sending_tones
>+tp_cli_channel_interface_dtmf1_signal_callback_sending_tones
>+tp_cli_channel_interface_dtmf1_connect_to_stopped_tones
>+tp_cli_channel_interface_dtmf1_signal_callback_stopped_tones
>+tp_cli_channel_interface_dtmf1_connect_to_tones_deferred
>+tp_cli_channel_interface_dtmf1_signal_callback_tones_deferred
>+<SUBSECTION>
>+tp_cli_channel_interface_hold1_callback_for_get_hold_state
>+tp_cli_channel_interface_hold1_call_get_hold_state
>+tp_cli_channel_interface_hold1_callback_for_request_hold
>+tp_cli_channel_interface_hold1_call_request_hold
>+tp_cli_channel_interface_hold1_signal_callback_hold_state_changed
>+tp_cli_channel_interface_hold1_connect_to_hold_state_changed
> </SECTION>
> 
> <SECTION>
> <FILE>channel-tube</FILE>
> <TITLE>channel-tube</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed
>-tp_cli_channel_interface_tube_signal_callback_tube_channel_state_changed
>-tp_cli_channel_type_stream_tube_call_offer
>-tp_cli_channel_type_stream_tube_call_accept
>-tp_cli_channel_type_stream_tube_callback_for_offer
>-tp_cli_channel_type_stream_tube_callback_for_accept
>-tp_cli_channel_type_stream_tube_connect_to_new_remote_connection
>-tp_cli_channel_type_stream_tube_connect_to_new_local_connection
>-tp_cli_channel_type_stream_tube_connect_to_connection_closed
>-tp_cli_channel_type_stream_tube_signal_callback_new_remote_connection
>-tp_cli_channel_type_stream_tube_signal_callback_new_local_connection
>-tp_cli_channel_type_stream_tube_signal_callback_connection_closed
>-tp_cli_channel_type_dbus_tube_call_offer
>-tp_cli_channel_type_dbus_tube_call_accept
>-tp_cli_channel_type_dbus_tube_callback_for_offer
>-tp_cli_channel_type_dbus_tube_callback_for_accept
>-tp_cli_channel_type_dbus_tube_connect_to_dbus_names_changed
>-tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed
>+tp_cli_channel_interface_tube1_connect_to_tube_channel_state_changed
>+tp_cli_channel_interface_tube1_signal_callback_tube_channel_state_changed
>+tp_cli_channel_type_stream_tube1_call_offer
>+tp_cli_channel_type_stream_tube1_call_accept
>+tp_cli_channel_type_stream_tube1_callback_for_offer
>+tp_cli_channel_type_stream_tube1_callback_for_accept
>+tp_cli_channel_type_stream_tube1_connect_to_new_remote_connection
>+tp_cli_channel_type_stream_tube1_connect_to_new_local_connection
>+tp_cli_channel_type_stream_tube1_connect_to_connection_closed
>+tp_cli_channel_type_stream_tube1_signal_callback_new_remote_connection
>+tp_cli_channel_type_stream_tube1_signal_callback_new_local_connection
>+tp_cli_channel_type_stream_tube1_signal_callback_connection_closed
>+tp_cli_channel_type_dbus_tube1_call_offer
>+tp_cli_channel_type_dbus_tube1_call_accept
>+tp_cli_channel_type_dbus_tube1_callback_for_offer
>+tp_cli_channel_type_dbus_tube1_callback_for_accept
>+tp_cli_channel_type_dbus_tube1_connect_to_dbus_names_changed
>+tp_cli_channel_type_dbus_tube1_signal_callback_dbus_names_changed
> </SECTION>
> 
> <SECTION>
> <FILE>channel-roomlist</FILE>
> <TITLE>channel-roomlist</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_type_room_list_call_get_listing_rooms
>-tp_cli_channel_type_room_list_call_list_rooms
>-tp_cli_channel_type_room_list_call_stop_listing
>-tp_cli_channel_type_room_list_callback_for_get_listing_rooms
>-tp_cli_channel_type_room_list_callback_for_list_rooms
>-tp_cli_channel_type_room_list_callback_for_stop_listing
>-tp_cli_channel_type_room_list_connect_to_got_rooms
>-tp_cli_channel_type_room_list_connect_to_listing_rooms
>-tp_cli_channel_type_room_list_signal_callback_got_rooms
>-tp_cli_channel_type_room_list_signal_callback_listing_rooms
>+tp_cli_channel_type_room_list1_call_get_listing_rooms
>+tp_cli_channel_type_room_list1_call_list_rooms
>+tp_cli_channel_type_room_list1_call_stop_listing
>+tp_cli_channel_type_room_list1_callback_for_get_listing_rooms
>+tp_cli_channel_type_room_list1_callback_for_list_rooms
>+tp_cli_channel_type_room_list1_callback_for_stop_listing
>+tp_cli_channel_type_room_list1_connect_to_got_rooms
>+tp_cli_channel_type_room_list1_connect_to_listing_rooms
>+tp_cli_channel_type_room_list1_signal_callback_got_rooms
>+tp_cli_channel_type_room_list1_signal_callback_listing_rooms
> </SECTION>
> 
> <SECTION>
> <FILE>cli-anonymity</FILE>
> <TITLE>cli-anonymity</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_changed
>-tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed
>+tp_cli_connection_interface_anonymity1_connect_to_anonymity_modes_changed
>+tp_cli_connection_interface_anonymity1_signal_callback_anonymity_modes_changed
> </SECTION>
> 
> <SECTION>
> <FILE>cli-service-point</FILE>
> <TITLE>cli-service-point</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_interface_service_point_connect_to_service_point_changed
>-tp_cli_channel_interface_service_point_signal_callback_service_point_changed
>-tp_cli_connection_interface_service_point_connect_to_service_points_changed
>-tp_cli_connection_interface_service_point_signal_callback_service_points_changed
>+tp_cli_channel_interface_service_point1_connect_to_service_point_changed
>+tp_cli_channel_interface_service_point1_signal_callback_service_point_changed
>+tp_cli_connection_interface_service_point1_connect_to_service_points_changed
>+tp_cli_connection_interface_service_point1_signal_callback_service_points_changed
> </SECTION>
> 
> <SECTION>
>@@ -3390,111 +3390,111 @@ tp_cli_connection_add_signals
> <FILE>connection-aliasing</FILE>
> <TITLE>connection-aliasing</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_aliasing_call_request_aliases
>-tp_cli_connection_interface_aliasing_call_set_aliases
>-tp_cli_connection_interface_aliasing_callback_for_request_aliases
>-tp_cli_connection_interface_aliasing_callback_for_set_aliases
>-tp_cli_connection_interface_aliasing_connect_to_aliases_changed
>-tp_cli_connection_interface_aliasing_signal_callback_aliases_changed
>+tp_cli_connection_interface_aliasing1_call_request_aliases
>+tp_cli_connection_interface_aliasing1_call_set_aliases
>+tp_cli_connection_interface_aliasing1_callback_for_request_aliases
>+tp_cli_connection_interface_aliasing1_callback_for_set_aliases
>+tp_cli_connection_interface_aliasing1_connect_to_aliases_changed
>+tp_cli_connection_interface_aliasing1_signal_callback_aliases_changed
> </SECTION>
> 
> <SECTION>
> <FILE>connection-avatars</FILE>
> <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_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
>+tp_cli_connection_interface_avatars1_call_clear_avatar
>+tp_cli_connection_interface_avatars1_call_get_known_avatar_tokens
>+tp_cli_connection_interface_avatars1_call_request_avatars
>+tp_cli_connection_interface_avatars1_call_set_avatar
>+tp_cli_connection_interface_avatars1_callback_for_clear_avatar
>+tp_cli_connection_interface_avatars1_callback_for_get_known_avatar_tokens
>+tp_cli_connection_interface_avatars1_callback_for_request_avatars
>+tp_cli_connection_interface_avatars1_callback_for_set_avatar
>+tp_cli_connection_interface_avatars1_connect_to_avatar_retrieved
>+tp_cli_connection_interface_avatars1_connect_to_avatar_updated
>+tp_cli_connection_interface_avatars1_signal_callback_avatar_retrieved
>+tp_cli_connection_interface_avatars1_signal_callback_avatar_updated
> </SECTION>
> 
> <SECTION>
> <FILE>connection-balance</FILE>
> <TITLE>connection-balance</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_balance_connect_to_balance_changed
>-tp_cli_connection_interface_balance_signal_callback_balance_changed
>+tp_cli_connection_interface_balance1_connect_to_balance_changed
>+tp_cli_connection_interface_balance1_signal_callback_balance_changed
> </SECTION>
> 
> <SECTION>
> <FILE>connection-caps</FILE>
> <TITLE>connection-caps</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-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
>+tp_cli_connection_interface_contact_capabilities1_callback_for_update_capabilities
>+tp_cli_connection_interface_contact_capabilities1_call_update_capabilities
>+tp_cli_connection_interface_contact_capabilities1_signal_callback_contact_capabilities_changed
>+tp_cli_connection_interface_contact_capabilities1_connect_to_contact_capabilities_changed
> </SECTION>
> 
> <SECTION>
> <FILE>connection-contact-list</FILE>
> <TITLE>connection-contact-list</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_contact_blocking_call_block_contacts
>-tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts
>-tp_cli_connection_interface_contact_blocking_call_unblock_contacts
>-tp_cli_connection_interface_contact_blocking_callback_for_block_contacts
>-tp_cli_connection_interface_contact_blocking_callback_for_request_blocked_contacts
>-tp_cli_connection_interface_contact_blocking_callback_for_unblock_contacts
>-tp_cli_connection_interface_contact_blocking_connect_to_blocked_contacts_changed
>-tp_cli_connection_interface_contact_blocking_signal_callback_blocked_contacts_changed
>-tp_cli_connection_interface_contact_groups_call_add_to_group
>-tp_cli_connection_interface_contact_groups_call_remove_from_group
>-tp_cli_connection_interface_contact_groups_call_remove_group
>-tp_cli_connection_interface_contact_groups_call_rename_group
>-tp_cli_connection_interface_contact_groups_call_set_contact_groups
>-tp_cli_connection_interface_contact_groups_call_set_group_members
>-tp_cli_connection_interface_contact_groups_callback_for_add_to_group
>-tp_cli_connection_interface_contact_groups_callback_for_remove_from_group
>-tp_cli_connection_interface_contact_groups_callback_for_remove_group
>-tp_cli_connection_interface_contact_groups_callback_for_rename_group
>-tp_cli_connection_interface_contact_groups_callback_for_set_contact_groups
>-tp_cli_connection_interface_contact_groups_callback_for_set_group_members
>-tp_cli_connection_interface_contact_groups_connect_to_group_renamed
>-tp_cli_connection_interface_contact_groups_connect_to_groups_changed
>-tp_cli_connection_interface_contact_groups_connect_to_groups_created
>-tp_cli_connection_interface_contact_groups_connect_to_groups_removed
>-tp_cli_connection_interface_contact_groups_signal_callback_group_renamed
>-tp_cli_connection_interface_contact_groups_signal_callback_groups_changed
>-tp_cli_connection_interface_contact_groups_signal_callback_groups_created
>-tp_cli_connection_interface_contact_groups_signal_callback_groups_removed
>-tp_cli_connection_interface_contact_list_call_authorize_publication
>-tp_cli_connection_interface_contact_list_call_download
>-tp_cli_connection_interface_contact_list_call_remove_contacts
>-tp_cli_connection_interface_contact_list_call_request_subscription
>-tp_cli_connection_interface_contact_list_call_unpublish
>-tp_cli_connection_interface_contact_list_call_unsubscribe
>-tp_cli_connection_interface_contact_list_callback_for_authorize_publication
>-tp_cli_connection_interface_contact_list_callback_for_download
>-tp_cli_connection_interface_contact_list_callback_for_remove_contacts
>-tp_cli_connection_interface_contact_list_callback_for_request_subscription
>-tp_cli_connection_interface_contact_list_callback_for_unpublish
>-tp_cli_connection_interface_contact_list_callback_for_unsubscribe
>-tp_cli_connection_interface_contact_list_connect_to_contacts_changed
>-tp_cli_connection_interface_contact_list_signal_callback_contacts_changed
>-tp_cli_connection_interface_contact_list_connect_to_contact_list_state_changed
>-tp_cli_connection_interface_contact_list_signal_callback_contact_list_state_changed
>+tp_cli_connection_interface_contact_blocking1_call_block_contacts
>+tp_cli_connection_interface_contact_blocking1_call_request_blocked_contacts
>+tp_cli_connection_interface_contact_blocking1_call_unblock_contacts
>+tp_cli_connection_interface_contact_blocking1_callback_for_block_contacts
>+tp_cli_connection_interface_contact_blocking1_callback_for_request_blocked_contacts
>+tp_cli_connection_interface_contact_blocking1_callback_for_unblock_contacts
>+tp_cli_connection_interface_contact_blocking1_connect_to_blocked_contacts_changed
>+tp_cli_connection_interface_contact_blocking1_signal_callback_blocked_contacts_changed
>+tp_cli_connection_interface_contact_groups1_call_add_to_group
>+tp_cli_connection_interface_contact_groups1_call_remove_from_group
>+tp_cli_connection_interface_contact_groups1_call_remove_group
>+tp_cli_connection_interface_contact_groups1_call_rename_group
>+tp_cli_connection_interface_contact_groups1_call_set_contact_groups
>+tp_cli_connection_interface_contact_groups1_call_set_group_members
>+tp_cli_connection_interface_contact_groups1_callback_for_add_to_group
>+tp_cli_connection_interface_contact_groups1_callback_for_remove_from_group
>+tp_cli_connection_interface_contact_groups1_callback_for_remove_group
>+tp_cli_connection_interface_contact_groups1_callback_for_rename_group
>+tp_cli_connection_interface_contact_groups1_callback_for_set_contact_groups
>+tp_cli_connection_interface_contact_groups1_callback_for_set_group_members
>+tp_cli_connection_interface_contact_groups1_connect_to_group_renamed
>+tp_cli_connection_interface_contact_groups1_connect_to_groups_changed
>+tp_cli_connection_interface_contact_groups1_connect_to_groups_created
>+tp_cli_connection_interface_contact_groups1_connect_to_groups_removed
>+tp_cli_connection_interface_contact_groups1_signal_callback_group_renamed
>+tp_cli_connection_interface_contact_groups1_signal_callback_groups_changed
>+tp_cli_connection_interface_contact_groups1_signal_callback_groups_created
>+tp_cli_connection_interface_contact_groups1_signal_callback_groups_removed
>+tp_cli_connection_interface_contact_list1_call_authorize_publication
>+tp_cli_connection_interface_contact_list1_call_download
>+tp_cli_connection_interface_contact_list1_call_remove_contacts
>+tp_cli_connection_interface_contact_list1_call_request_subscription
>+tp_cli_connection_interface_contact_list1_call_unpublish
>+tp_cli_connection_interface_contact_list1_call_unsubscribe
>+tp_cli_connection_interface_contact_list1_callback_for_authorize_publication
>+tp_cli_connection_interface_contact_list1_callback_for_download
>+tp_cli_connection_interface_contact_list1_callback_for_remove_contacts
>+tp_cli_connection_interface_contact_list1_callback_for_request_subscription
>+tp_cli_connection_interface_contact_list1_callback_for_unpublish
>+tp_cli_connection_interface_contact_list1_callback_for_unsubscribe
>+tp_cli_connection_interface_contact_list1_connect_to_contacts_changed
>+tp_cli_connection_interface_contact_list1_signal_callback_contacts_changed
>+tp_cli_connection_interface_contact_list1_connect_to_contact_list_state_changed
>+tp_cli_connection_interface_contact_list1_signal_callback_contact_list_state_changed
> <SUBSECTION Private>
> # deliberately "undocumented" because it can interfere with handle ownership
> # tracking
>-tp_cli_connection_interface_contact_list_call_get_contact_list_attributes
>-tp_cli_connection_interface_contact_list_callback_for_get_contact_list_attributes
>+tp_cli_connection_interface_contact_list1_call_get_contact_list_attributes
>+tp_cli_connection_interface_contact_list1_callback_for_get_contact_list_attributes
> </SECTION>
> 
> <SECTION>
> <FILE>connection-cellular</FILE>
> <TITLE>connection-cellular</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_cellular_connect_to_imsi_changed
>-tp_cli_connection_interface_cellular_signal_callback_imsi_changed
>+tp_cli_connection_interface_cellular1_connect_to_imsi_changed
>+tp_cli_connection_interface_cellular1_signal_callback_imsi_changed
> </SECTION>
> 
> <SECTION>
>@@ -3511,14 +3511,14 @@ tp_cli_connection_interface_contacts_callback_for_get_contact_by_id
> <FILE>connection-contact-info</FILE>
> <TITLE>connection-contact-info</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_contact_info_call_refresh_contact_info
>-tp_cli_connection_interface_contact_info_call_request_contact_info
>-tp_cli_connection_interface_contact_info_call_set_contact_info
>-tp_cli_connection_interface_contact_info_callback_for_refresh_contact_info
>-tp_cli_connection_interface_contact_info_callback_for_request_contact_info
>-tp_cli_connection_interface_contact_info_callback_for_set_contact_info
>-tp_cli_connection_interface_contact_info_connect_to_contact_info_changed
>-tp_cli_connection_interface_contact_info_signal_callback_contact_info_changed
>+tp_cli_connection_interface_contact_info1_call_refresh_contact_info
>+tp_cli_connection_interface_contact_info1_call_request_contact_info
>+tp_cli_connection_interface_contact_info1_call_set_contact_info
>+tp_cli_connection_interface_contact_info1_callback_for_refresh_contact_info
>+tp_cli_connection_interface_contact_info1_callback_for_request_contact_info
>+tp_cli_connection_interface_contact_info1_callback_for_set_contact_info
>+tp_cli_connection_interface_contact_info1_connect_to_contact_info_changed
>+tp_cli_connection_interface_contact_info1_signal_callback_contact_info_changed
> </SECTION>
> 
> <SECTION>
>@@ -3539,66 +3539,66 @@ tp_cli_connection_interface_requests_signal_callback_new_channels
> <FILE>connection-presence</FILE>
> <TITLE>connection-presence</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_presence_call_set_presence
>-tp_cli_connection_interface_presence_callback_for_set_presence
>-tp_cli_connection_interface_presence_connect_to_presences_changed
>-tp_cli_connection_interface_presence_signal_callback_presences_changed
>+tp_cli_connection_interface_presence1_call_set_presence
>+tp_cli_connection_interface_presence1_callback_for_set_presence
>+tp_cli_connection_interface_presence1_connect_to_presences_changed
>+tp_cli_connection_interface_presence1_signal_callback_presences_changed
> </SECTION>
> 
> <SECTION>
> <FILE>connection-location</FILE>
> <TITLE>connection-location</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_location_connect_to_location_updated
>-tp_cli_connection_interface_location_signal_callback_location_updated
>-tp_cli_connection_interface_location_call_request_location
>-tp_cli_connection_interface_location_callback_for_request_location
>-tp_cli_connection_interface_location_call_set_location
>-tp_cli_connection_interface_location_callback_for_set_location
>+tp_cli_connection_interface_location1_connect_to_location_updated
>+tp_cli_connection_interface_location1_signal_callback_location_updated
>+tp_cli_connection_interface_location1_call_request_location
>+tp_cli_connection_interface_location1_callback_for_request_location
>+tp_cli_connection_interface_location1_call_set_location
>+tp_cli_connection_interface_location1_callback_for_set_location
> </SECTION>
> 
> <SECTION>
> <FILE>connection-powersaving</FILE>
> <TITLE>connection-powersaving</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_power_saving_call_set_power_saving
>-tp_cli_connection_interface_power_saving_callback_for_set_power_saving
>-tp_cli_connection_interface_power_saving_connect_to_power_saving_changed
>-tp_cli_connection_interface_power_saving_signal_callback_power_saving_changed
>+tp_cli_connection_interface_power_saving1_call_set_power_saving
>+tp_cli_connection_interface_power_saving1_callback_for_set_power_saving
>+tp_cli_connection_interface_power_saving1_connect_to_power_saving_changed
>+tp_cli_connection_interface_power_saving1_signal_callback_power_saving_changed
> </SECTION>
> 
> <SECTION>
> <FILE>connection-client-types</FILE>
> <TITLE>connection-client-types</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_client_types_call_request_client_types
>-tp_cli_connection_interface_client_types_callback_for_request_client_types
>-tp_cli_connection_interface_client_types_connect_to_client_types_updated
>-tp_cli_connection_interface_client_types_signal_callback_client_types_updated
>+tp_cli_connection_interface_client_types1_call_request_client_types
>+tp_cli_connection_interface_client_types1_callback_for_request_client_types
>+tp_cli_connection_interface_client_types1_connect_to_client_types_updated
>+tp_cli_connection_interface_client_types1_signal_callback_client_types_updated
> </SECTION>
> 
> <SECTION>
> <FILE>connection-mail</FILE>
> <TITLE>connection-mail</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_mail_notification_call_request_inbox_url
>-tp_cli_connection_interface_mail_notification_call_request_mail_url
>-tp_cli_connection_interface_mail_notification_callback_for_request_inbox_url
>-tp_cli_connection_interface_mail_notification_callback_for_request_mail_url
>-tp_cli_connection_interface_mail_notification_connect_to_mails_received
>-tp_cli_connection_interface_mail_notification_connect_to_unread_mails_changed
>-tp_cli_connection_interface_mail_notification_signal_callback_mails_received
>-tp_cli_connection_interface_mail_notification_signal_callback_unread_mails_changed
>+tp_cli_connection_interface_mail_notification1_call_request_inbox_url
>+tp_cli_connection_interface_mail_notification1_call_request_mail_url
>+tp_cli_connection_interface_mail_notification1_callback_for_request_inbox_url
>+tp_cli_connection_interface_mail_notification1_callback_for_request_mail_url
>+tp_cli_connection_interface_mail_notification1_connect_to_mails_received
>+tp_cli_connection_interface_mail_notification1_connect_to_unread_mails_changed
>+tp_cli_connection_interface_mail_notification1_signal_callback_mails_received
>+tp_cli_connection_interface_mail_notification1_signal_callback_unread_mails_changed
> </SECTION>
> 
> <SECTION>
> <FILE>connection-addressing</FILE>
> <TITLE>connection-addressing</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_connection_interface_addressing_call_get_contacts_by_uri
>-tp_cli_connection_interface_addressing_call_get_contacts_by_vcard_field
>-tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri
>-tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vcard_field
>+tp_cli_connection_interface_addressing1_call_get_contacts_by_uri
>+tp_cli_connection_interface_addressing1_call_get_contacts_by_vcard_field
>+tp_cli_connection_interface_addressing1_callback_for_get_contacts_by_uri
>+tp_cli_connection_interface_addressing1_callback_for_get_contacts_by_vcard_field
> </SECTION>
> 
> <SECTION>
>@@ -3664,10 +3664,10 @@ tp_cli_protocol_call_identify_account
> tp_cli_protocol_call_normalize_contact
> tp_cli_protocol_callback_for_identify_account
> tp_cli_protocol_callback_for_normalize_contact
>-tp_cli_protocol_interface_addressing_call_normalize_contact_uri
>-tp_cli_protocol_interface_addressing_call_normalize_vcard_address
>-tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri
>-tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_address
>+tp_cli_protocol_interface_addressing1_call_normalize_contact_uri
>+tp_cli_protocol_interface_addressing1_call_normalize_vcard_address
>+tp_cli_protocol_interface_addressing1_callback_for_normalize_contact_uri
>+tp_cli_protocol_interface_addressing1_callback_for_normalize_vcard_address
> <SUBSECTION Standard>
> tp_cli_connection_manager_add_signals
> tp_cli_protocol_add_signals
>@@ -3880,36 +3880,36 @@ TP_TYPE_SVC_ACCOUNT
> tp_svc_account_get_type
> TP_SVC_ACCOUNT_GET_CLASS
> <SUBSECTION>
>-TpSvcAccountInterfaceAvatar
>-TpSvcAccountInterfaceAvatarClass
>-tp_svc_account_interface_avatar_emit_avatar_changed
>+TpSvcAccountInterfaceAvatar1
>+TpSvcAccountInterfaceAvatar1Class
>+tp_svc_account_interface_avatar1_emit_avatar_changed
> <SUBSECTION Standard>
>-TP_SVC_ACCOUNT_INTERFACE_AVATAR
>-TP_IS_SVC_ACCOUNT_INTERFACE_AVATAR
>-TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR
>-tp_svc_account_interface_avatar_get_type
>-TP_SVC_ACCOUNT_INTERFACE_AVATAR_GET_CLASS
>+TP_SVC_ACCOUNT_INTERFACE_AVATAR1
>+TP_IS_SVC_ACCOUNT_INTERFACE_AVATAR1
>+TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR1
>+tp_svc_account_interface_avatar1_get_type
>+TP_SVC_ACCOUNT_INTERFACE_AVATAR1_GET_CLASS
> <SUBSECTION>
>-TpSvcAccountInterfaceStorage
>-TpSvcAccountInterfaceStorageClass
>+TpSvcAccountInterfaceStorage1
>+TpSvcAccountInterfaceStorage1Class
> <SUBSECTION Standard>
>-TP_IS_SVC_ACCOUNT_INTERFACE_STORAGE
>-TP_SVC_ACCOUNT_INTERFACE_STORAGE
>-TP_SVC_ACCOUNT_INTERFACE_STORAGE_GET_CLASS
>-TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE
>-tp_svc_account_interface_storage_get_type
>+TP_IS_SVC_ACCOUNT_INTERFACE_STORAGE1
>+TP_SVC_ACCOUNT_INTERFACE_STORAGE1
>+TP_SVC_ACCOUNT_INTERFACE_STORAGE1_GET_CLASS
>+TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE1
>+tp_svc_account_interface_storage1_get_type
> <SUBSECTION>
>-TpSvcAccountInterfaceAddressing
>-TpSvcAccountInterfaceAddressingClass
>-tp_svc_account_interface_addressing_implement_set_uri_scheme_association
>-tp_svc_account_interface_addressing_return_from_set_uri_scheme_association
>-tp_svc_account_interface_addressing_set_uri_scheme_association_impl
>+TpSvcAccountInterfaceAddressing1
>+TpSvcAccountInterfaceAddressing1Class
>+tp_svc_account_interface_addressing1_implement_set_uri_scheme_association
>+tp_svc_account_interface_addressing1_return_from_set_uri_scheme_association
>+tp_svc_account_interface_addressing1_set_uri_scheme_association_impl
> <SUBSECTION Standard>
>-TP_IS_SVC_ACCOUNT_INTERFACE_ADDRESSING
>-TP_SVC_ACCOUNT_INTERFACE_ADDRESSING
>-TP_SVC_ACCOUNT_INTERFACE_ADDRESSING_GET_CLASS
>-TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING
>-tp_svc_account_interface_addressing_get_type
>+TP_IS_SVC_ACCOUNT_INTERFACE_ADDRESSING1
>+TP_SVC_ACCOUNT_INTERFACE_ADDRESSING1
>+TP_SVC_ACCOUNT_INTERFACE_ADDRESSING1_GET_CLASS
>+TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING1
>+tp_svc_account_interface_addressing1_get_type
> </SECTION>
> 
> <SECTION>
>@@ -4120,11 +4120,11 @@ tp_cli_account_connect_to_account_property_changed
> tp_cli_account_signal_callback_removed
> tp_cli_account_connect_to_removed
> <SUBSECTION>
>-tp_cli_account_interface_avatar_signal_callback_avatar_changed
>-tp_cli_account_interface_avatar_connect_to_avatar_changed
>+tp_cli_account_interface_avatar1_signal_callback_avatar_changed
>+tp_cli_account_interface_avatar1_connect_to_avatar_changed
> <SUBSECTION>
>-tp_cli_account_interface_addressing_callback_for_set_uri_scheme_association
>-tp_cli_account_interface_addressing_call_set_uri_scheme_association
>+tp_cli_account_interface_addressing1_callback_for_set_uri_scheme_association
>+tp_cli_account_interface_addressing1_call_set_uri_scheme_association
> <SUBSECTION Standard>
> tp_cli_account_add_signals
> tp_cli_account_manager_add_signals
>@@ -4163,10 +4163,10 @@ 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_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
>-tp_cli_channel_dispatcher_interface_operation_list_connect_to_new_dispatch_operation
>+tp_cli_channel_dispatcher_interface_operation_list1_signal_callback_dispatch_operation_finished
>+tp_cli_channel_dispatcher_interface_operation_list1_connect_to_dispatch_operation_finished
>+tp_cli_channel_dispatcher_interface_operation_list1_signal_callback_new_dispatch_operation
>+tp_cli_channel_dispatcher_interface_operation_list1_connect_to_new_dispatch_operation
> <SUBSECTION>
> tp_cli_channel_request_callback_for_cancel
> tp_cli_channel_request_call_cancel
>@@ -4212,21 +4212,21 @@ tp_svc_channel_dispatcher_present_channel_impl
> tp_svc_channel_dispatcher_return_from_delegate_channels
> tp_svc_channel_dispatcher_return_from_present_channel
> <SUBSECTION>
>-TpSvcChannelDispatcherInterfaceOperationList
>-TpSvcChannelDispatcherInterfaceOperationListClass
>-tp_svc_channel_dispatcher_interface_operation_list_emit_new_dispatch_operation
>-tp_svc_channel_dispatcher_interface_operation_list_emit_dispatch_operation_finished
>+TpSvcChannelDispatcherInterfaceOperationList1
>+TpSvcChannelDispatcherInterfaceOperationList1Class
>+tp_svc_channel_dispatcher_interface_operation_list1_emit_new_dispatch_operation
>+tp_svc_channel_dispatcher_interface_operation_list1_emit_dispatch_operation_finished
> <SUBSECTION Standard>
> TP_SVC_CHANNEL_DISPATCHER
>-TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
>+TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1
> TP_IS_SVC_CHANNEL_DISPATCHER
>-TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
>+TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1
> TP_TYPE_SVC_CHANNEL_DISPATCHER
>-TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST
>+TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1
> tp_svc_channel_dispatcher_get_type
>-tp_svc_channel_dispatcher_interface_operation_list_get_type
>+tp_svc_channel_dispatcher_interface_operation_list1_get_type
> TP_SVC_CHANNEL_DISPATCHER_GET_CLASS
>-TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_GET_CLASS
>+TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1_GET_CLASS
> </SECTION>
> 
> <SECTION>
>@@ -4442,18 +4442,18 @@ TP_TYPE_SVC_CLIENT_OBSERVER
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <TITLE>svc-debug</TITLE>
> <FILE>svc-debug</FILE>
>-TpSvcDebug
>-TpSvcDebugClass
>-tp_svc_debug_get_messages_impl
>-tp_svc_debug_implement_get_messages
>-tp_svc_debug_return_from_get_messages
>-tp_svc_debug_emit_new_debug_message
>+TpSvcDebug1
>+TpSvcDebug1Class
>+tp_svc_debug1_get_messages_impl
>+tp_svc_debug1_implement_get_messages
>+tp_svc_debug1_return_from_get_messages
>+tp_svc_debug1_emit_new_debug_message
> <SUBSECTION Standard>
>-TP_SVC_DEBUG
>-TP_IS_SVC_DEBUG
>-TP_TYPE_SVC_DEBUG
>-TP_SVC_DEBUG_GET_CLASS
>-tp_svc_debug_get_type
>+TP_SVC_DEBUG1
>+TP_IS_SVC_DEBUG1
>+TP_TYPE_SVC_DEBUG1
>+TP_SVC_DEBUG1_GET_CLASS
>+tp_svc_debug1_get_type
> </SECTION>
> 
> <SECTION>
>@@ -4759,14 +4759,14 @@ tp_svc_protocol_normalize_contact_impl
> tp_svc_protocol_return_from_identify_account
> tp_svc_protocol_return_from_normalize_contact
> <SUBSECTION>
>-TpSvcProtocolInterfaceAddressing
>-TpSvcProtocolInterfaceAddressingClass
>+TpSvcProtocolInterfaceAddressing1
>+TpSvcProtocolInterfaceAddressing1Class
> <SUBSECTION>
>-TpSvcProtocolInterfacePresence
>-TpSvcProtocolInterfacePresenceClass
>+TpSvcProtocolInterfacePresence1
>+TpSvcProtocolInterfacePresence1Class
> <SUBSECTION>
>-TpSvcProtocolInterfaceAvatars
>-TpSvcProtocolInterfaceAvatarsClass
>+TpSvcProtocolInterfaceAvatars1
>+TpSvcProtocolInterfaceAvatars1Class
> <SUBSECTION Standard>
> tp_svc_protocol_get_type
> TP_SVC_PROTOCOL
>@@ -4774,29 +4774,29 @@ TP_SVC_PROTOCOL_CLASS
> TP_SVC_PROTOCOL_GET_CLASS
> TP_IS_SVC_PROTOCOL
> TP_TYPE_SVC_PROTOCOL
>-TP_IS_SVC_PROTOCOL_INTERFACE_ADDRESSING
>-TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESSING
>-tp_svc_protocol_interface_addressing_get_type
>-TP_SVC_PROTOCOL_INTERFACE_ADDRESSING
>-TP_SVC_PROTOCOL_INTERFACE_ADDRESSING_GET_CLASS
>-tp_svc_protocol_interface_addressing_implement_normalize_contact_uri
>-tp_svc_protocol_interface_addressing_implement_normalize_vcard_address
>-tp_svc_protocol_interface_addressing_normalize_contact_uri_impl
>-tp_svc_protocol_interface_addressing_normalize_vcard_address_impl
>-tp_svc_protocol_interface_addressing_return_from_normalize_contact_uri
>-tp_svc_protocol_interface_addressing_return_from_normalize_vcard_address
>-tp_svc_protocol_interface_presence_get_type
>-TP_SVC_PROTOCOL_INTERFACE_PRESENCE
>-TP_SVC_PROTOCOL_INTERFACE_PRESENCE_CLASS
>-TP_SVC_PROTOCOL_INTERFACE_PRESENCE_GET_CLASS
>-TP_IS_SVC_PROTOCOL_INTERFACE_PRESENCE
>-TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENCE
>-tp_svc_protocol_interface_avatars_get_type
>-TP_SVC_PROTOCOL_INTERFACE_AVATARS
>-TP_SVC_PROTOCOL_INTERFACE_AVATARS_CLASS
>-TP_SVC_PROTOCOL_INTERFACE_AVATARS_GET_CLASS
>-TP_IS_SVC_PROTOCOL_INTERFACE_AVATARS
>-TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS
>+TP_IS_SVC_PROTOCOL_INTERFACE_ADDRESSING1
>+TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESSING1
>+tp_svc_protocol_interface_addressing1_get_type
>+TP_SVC_PROTOCOL_INTERFACE_ADDRESSING1
>+TP_SVC_PROTOCOL_INTERFACE_ADDRESSING1_GET_CLASS
>+tp_svc_protocol_interface_addressing1_implement_normalize_contact_uri
>+tp_svc_protocol_interface_addressing1_implement_normalize_vcard_address
>+tp_svc_protocol_interface_addressing1_normalize_contact_uri_impl
>+tp_svc_protocol_interface_addressing1_normalize_vcard_address_impl
>+tp_svc_protocol_interface_addressing1_return_from_normalize_contact_uri
>+tp_svc_protocol_interface_addressing1_return_from_normalize_vcard_address
>+tp_svc_protocol_interface_presence1_get_type
>+TP_SVC_PROTOCOL_INTERFACE_PRESENCE1
>+TP_SVC_PROTOCOL_INTERFACE_PRESENCE1_CLASS
>+TP_SVC_PROTOCOL_INTERFACE_PRESENCE1_GET_CLASS
>+TP_IS_SVC_PROTOCOL_INTERFACE_PRESENCE1
>+TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENCE1
>+tp_svc_protocol_interface_avatars1_get_type
>+TP_SVC_PROTOCOL_INTERFACE_AVATARS1
>+TP_SVC_PROTOCOL_INTERFACE_AVATARS1_CLASS
>+TP_SVC_PROTOCOL_INTERFACE_AVATARS1_GET_CLASS
>+TP_IS_SVC_PROTOCOL_INTERFACE_AVATARS1
>+TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS1
> </SECTION>
> 
> <SECTION>
>@@ -4845,41 +4845,41 @@ TpProtocolClassPrivate
> <FILE>channel-contactsearch</FILE>
> <TITLE>channel-contactsearch</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_type_contact_search_call_more
>-tp_cli_channel_type_contact_search_call_search
>-tp_cli_channel_type_contact_search_call_stop
>-tp_cli_channel_type_contact_search_callback_for_more
>-tp_cli_channel_type_contact_search_callback_for_search
>-tp_cli_channel_type_contact_search_callback_for_stop
>-tp_cli_channel_type_contact_search_connect_to_search_result_received
>-tp_cli_channel_type_contact_search_connect_to_search_state_changed
>-tp_cli_channel_type_contact_search_signal_callback_search_result_received
>-tp_cli_channel_type_contact_search_signal_callback_search_state_changed
>+tp_cli_channel_type_contact_search1_call_more
>+tp_cli_channel_type_contact_search1_call_search
>+tp_cli_channel_type_contact_search1_call_stop
>+tp_cli_channel_type_contact_search1_callback_for_more
>+tp_cli_channel_type_contact_search1_callback_for_search
>+tp_cli_channel_type_contact_search1_callback_for_stop
>+tp_cli_channel_type_contact_search1_connect_to_search_result_received
>+tp_cli_channel_type_contact_search1_connect_to_search_state_changed
>+tp_cli_channel_type_contact_search1_signal_callback_search_result_received
>+tp_cli_channel_type_contact_search1_signal_callback_search_state_changed
> </SECTION>
> 
> <SECTION>
> <FILE>svc-channel-contactsearch</FILE>
> <TITLE>svc-channel-contactsearch</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelTypeContactSearch
>-TpSvcChannelTypeContactSearchClass
>-tp_svc_channel_type_contact_search_emit_search_result_received
>-tp_svc_channel_type_contact_search_emit_search_state_changed
>-tp_svc_channel_type_contact_search_implement_more
>-tp_svc_channel_type_contact_search_implement_search
>-tp_svc_channel_type_contact_search_implement_stop
>-tp_svc_channel_type_contact_search_more_impl
>-tp_svc_channel_type_contact_search_return_from_more
>-tp_svc_channel_type_contact_search_return_from_search
>-tp_svc_channel_type_contact_search_return_from_stop
>-tp_svc_channel_type_contact_search_search_impl
>-tp_svc_channel_type_contact_search_stop_impl
>-<SUBSECTION Standard>
>-TP_IS_SVC_CHANNEL_TYPE_CONTACT_SEARCH
>-TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH
>-TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH_GET_CLASS
>-TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH
>-tp_svc_channel_type_contact_search_get_type
>+TpSvcChannelTypeContactSearch1
>+TpSvcChannelTypeContactSearch1Class
>+tp_svc_channel_type_contact_search1_emit_search_result_received
>+tp_svc_channel_type_contact_search1_emit_search_state_changed
>+tp_svc_channel_type_contact_search1_implement_more
>+tp_svc_channel_type_contact_search1_implement_search
>+tp_svc_channel_type_contact_search1_implement_stop
>+tp_svc_channel_type_contact_search1_more_impl
>+tp_svc_channel_type_contact_search1_return_from_more
>+tp_svc_channel_type_contact_search1_return_from_search
>+tp_svc_channel_type_contact_search1_return_from_stop
>+tp_svc_channel_type_contact_search1_search_impl
>+tp_svc_channel_type_contact_search1_stop_impl
>+<SUBSECTION Standard>
>+TP_IS_SVC_CHANNEL_TYPE_CONTACT_SEARCH1
>+TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH1
>+TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH1_GET_CLASS
>+TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH1
>+tp_svc_channel_type_contact_search1_get_type
> </SECTION>
> 
> <SECTION>
>@@ -4933,8 +4933,8 @@ TP_TYPE_ACCOUNT_CHANNEL_REQUEST
> <TITLE>svc-tls</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <SUBSECTION>
>-TpSvcChannelTypeServerTLSConnection
>-TpSvcChannelTypeServerTLSConnectionClass
>+TpSvcChannelTypeServerTLSConnection1
>+TpSvcChannelTypeServerTLSConnection1Class
> <SUBSECTION>
> TpSvcAuthenticationTLSCertificate
> TpSvcAuthenticationTLSCertificateClass
>@@ -4948,15 +4948,15 @@ tp_svc_authentication_tls_certificate_implement_reject
> tp_svc_authentication_tls_certificate_emit_rejected
> <SUBSECTION Standard>
> TP_IS_SVC_AUTHENTICATION_TLS_CERTIFICATE
>-TP_IS_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION
>+TP_IS_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION1
> TP_SVC_AUTHENTICATION_TLS_CERTIFICATE
> TP_SVC_AUTHENTICATION_TLS_CERTIFICATE_GET_CLASS
>-TP_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION
>-TP_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION_GET_CLASS
>+TP_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION1
>+TP_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION1_GET_CLASS
> TP_TYPE_SVC_AUTHENTICATION_TLS_CERTIFICATE
>-TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION
>+TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION1
> tp_svc_authentication_tls_certificate_get_type
>-tp_svc_channel_type_server_tls_connection_get_type
>+tp_svc_channel_type_server_tls_connection1_get_type
> </SECTION>
> 
> <SECTION>
>@@ -5183,105 +5183,105 @@ tp_dtmf_player_get_type
> <FILE>svc-channel-securable</FILE>
> <TITLE>svc-channel-securable</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelInterfaceSecurable
>-TpSvcChannelInterfaceSecurableClass
>+TpSvcChannelInterfaceSecurable1
>+TpSvcChannelInterfaceSecurable1Class
> <SUBSECTION Standard>
>-TP_SVC_CHANNEL_INTERFACE_SECURABLE
>-TP_IS_SVC_CHANNEL_INTERFACE_SECURABLE
>-TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABLE
>-tp_svc_channel_interface_securable_get_type
>-TP_SVC_CHANNEL_INTERFACE_SECURABLE_GET_CLASS
>+TP_SVC_CHANNEL_INTERFACE_SECURABLE1
>+TP_IS_SVC_CHANNEL_INTERFACE_SECURABLE1
>+TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABLE1
>+tp_svc_channel_interface_securable1_get_type
>+TP_SVC_CHANNEL_INTERFACE_SECURABLE1_GET_CLASS
> </SECTION>
> 
> <SECTION>
> <FILE>svc-channel-auth</FILE>
> <TITLE>svc-channel-auth</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelTypeServerAuthentication
>-TpSvcChannelTypeServerAuthenticationClass
>-<SUBSECTION>
>-TpSvcChannelInterfaceSASLAuthentication
>-TpSvcChannelInterfaceSASLAuthenticationClass
>-tp_svc_channel_interface_sasl_authentication_abort_sasl_impl
>-tp_svc_channel_interface_sasl_authentication_accept_sasl_impl
>-tp_svc_channel_interface_sasl_authentication_emit_new_challenge
>-tp_svc_channel_interface_sasl_authentication_emit_sasl_status_changed
>-tp_svc_channel_interface_sasl_authentication_implement_abort_sasl
>-tp_svc_channel_interface_sasl_authentication_implement_accept_sasl
>-tp_svc_channel_interface_sasl_authentication_implement_respond
>-tp_svc_channel_interface_sasl_authentication_implement_start_mechanism
>-tp_svc_channel_interface_sasl_authentication_implement_start_mechanism_with_data
>-tp_svc_channel_interface_sasl_authentication_respond_impl
>-tp_svc_channel_interface_sasl_authentication_return_from_abort_sasl
>-tp_svc_channel_interface_sasl_authentication_return_from_accept_sasl
>-tp_svc_channel_interface_sasl_authentication_return_from_respond
>-tp_svc_channel_interface_sasl_authentication_return_from_start_mechanism
>-tp_svc_channel_interface_sasl_authentication_return_from_start_mechanism_with_data
>-tp_svc_channel_interface_sasl_authentication_start_mechanism_impl
>-tp_svc_channel_interface_sasl_authentication_start_mechanism_with_data_impl
>-<SUBSECTION Standard>
>-TP_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION
>-TP_IS_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION
>-TP_TYPE_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION
>-tp_svc_channel_type_server_authentication_get_type
>-TP_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION_GET_CLASS
>-TP_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION
>-TP_IS_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION
>-TP_TYPE_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION
>-tp_svc_channel_interface_sasl_authentication_get_type
>-TP_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION_GET_CLASS
>-<SUBSECTION>
>-TpSvcChannelInterfaceCaptchaAuthentication
>-TpSvcChannelInterfaceCaptchaAuthenticationClass
>-<SUBSECTION Standard>
>-TP_IS_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION
>-TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION
>-TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_GET_CLASS
>-tp_svc_channel_interface_captcha_authentication_get_type
>-TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION
>-<SUBSECTION>
>-tp_svc_channel_interface_captcha_authentication_answer_captchas_impl
>-tp_svc_channel_interface_captcha_authentication_cancel_captcha_impl
>-tp_svc_channel_interface_captcha_authentication_get_captcha_data_impl
>-tp_svc_channel_interface_captcha_authentication_get_captchas_impl
>-tp_svc_channel_interface_captcha_authentication_implement_answer_captchas
>-tp_svc_channel_interface_captcha_authentication_implement_cancel_captcha
>-tp_svc_channel_interface_captcha_authentication_implement_get_captcha_data
>-tp_svc_channel_interface_captcha_authentication_implement_get_captchas
>-tp_svc_channel_interface_captcha_authentication_return_from_answer_captchas
>-tp_svc_channel_interface_captcha_authentication_return_from_cancel_captcha
>-tp_svc_channel_interface_captcha_authentication_return_from_get_captcha_data
>-tp_svc_channel_interface_captcha_authentication_return_from_get_captchas
>+TpSvcChannelTypeServerAuthentication1
>+TpSvcChannelTypeServerAuthentication1Class
>+<SUBSECTION>
>+TpSvcChannelInterfaceSASLAuthentication1
>+TpSvcChannelInterfaceSASLAuthentication1Class
>+tp_svc_channel_interface_sasl_authentication1_abort_sasl_impl
>+tp_svc_channel_interface_sasl_authentication1_accept_sasl_impl
>+tp_svc_channel_interface_sasl_authentication1_emit_new_challenge
>+tp_svc_channel_interface_sasl_authentication1_emit_sasl_status_changed
>+tp_svc_channel_interface_sasl_authentication1_implement_abort_sasl
>+tp_svc_channel_interface_sasl_authentication1_implement_accept_sasl
>+tp_svc_channel_interface_sasl_authentication1_implement_respond
>+tp_svc_channel_interface_sasl_authentication1_implement_start_mechanism
>+tp_svc_channel_interface_sasl_authentication1_implement_start_mechanism_with_data
>+tp_svc_channel_interface_sasl_authentication1_respond_impl
>+tp_svc_channel_interface_sasl_authentication1_return_from_abort_sasl
>+tp_svc_channel_interface_sasl_authentication1_return_from_accept_sasl
>+tp_svc_channel_interface_sasl_authentication1_return_from_respond
>+tp_svc_channel_interface_sasl_authentication1_return_from_start_mechanism
>+tp_svc_channel_interface_sasl_authentication1_return_from_start_mechanism_with_data
>+tp_svc_channel_interface_sasl_authentication1_start_mechanism_impl
>+tp_svc_channel_interface_sasl_authentication1_start_mechanism_with_data_impl
>+<SUBSECTION Standard>
>+TP_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION1
>+TP_IS_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION1
>+TP_TYPE_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION1
>+tp_svc_channel_type_server_authentication1_get_type
>+TP_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION1_GET_CLASS
>+TP_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION1
>+TP_IS_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION1
>+TP_TYPE_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION1
>+tp_svc_channel_interface_sasl_authentication1_get_type
>+TP_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_GET_CLASS
>+<SUBSECTION>
>+TpSvcChannelInterfaceCaptchaAuthentication1
>+TpSvcChannelInterfaceCaptchaAuthentication1Class
>+<SUBSECTION Standard>
>+TP_IS_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1
>+TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1
>+TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1_GET_CLASS
>+tp_svc_channel_interface_captcha_authentication1_get_type
>+TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION1
>+<SUBSECTION>
>+tp_svc_channel_interface_captcha_authentication1_answer_captchas_impl
>+tp_svc_channel_interface_captcha_authentication1_cancel_captcha_impl
>+tp_svc_channel_interface_captcha_authentication1_get_captcha_data_impl
>+tp_svc_channel_interface_captcha_authentication1_get_captchas_impl
>+tp_svc_channel_interface_captcha_authentication1_implement_answer_captchas
>+tp_svc_channel_interface_captcha_authentication1_implement_cancel_captcha
>+tp_svc_channel_interface_captcha_authentication1_implement_get_captcha_data
>+tp_svc_channel_interface_captcha_authentication1_implement_get_captchas
>+tp_svc_channel_interface_captcha_authentication1_return_from_answer_captchas
>+tp_svc_channel_interface_captcha_authentication1_return_from_cancel_captcha
>+tp_svc_channel_interface_captcha_authentication1_return_from_get_captcha_data
>+tp_svc_channel_interface_captcha_authentication1_return_from_get_captchas
> </SECTION>
> 
> <SECTION>
> <FILE>channel-auth</FILE>
> <TITLE>channel-auth</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_channel_interface_sasl_authentication_call_abort_sasl
>-tp_cli_channel_interface_sasl_authentication_call_accept_sasl
>-tp_cli_channel_interface_sasl_authentication_call_respond
>-tp_cli_channel_interface_sasl_authentication_call_start_mechanism
>-tp_cli_channel_interface_sasl_authentication_call_start_mechanism_with_data
>-tp_cli_channel_interface_sasl_authentication_callback_for_abort_sasl
>-tp_cli_channel_interface_sasl_authentication_callback_for_accept_sasl
>-tp_cli_channel_interface_sasl_authentication_callback_for_respond
>-tp_cli_channel_interface_sasl_authentication_callback_for_start_mechanism
>-tp_cli_channel_interface_sasl_authentication_callback_for_start_mechanism_with_data
>-tp_cli_channel_interface_sasl_authentication_connect_to_new_challenge
>-tp_cli_channel_interface_sasl_authentication_connect_to_sasl_status_changed
>+tp_cli_channel_interface_sasl_authentication1_call_abort_sasl
>+tp_cli_channel_interface_sasl_authentication1_call_accept_sasl
>+tp_cli_channel_interface_sasl_authentication1_call_respond
>+tp_cli_channel_interface_sasl_authentication1_call_start_mechanism
>+tp_cli_channel_interface_sasl_authentication1_call_start_mechanism_with_data
>+tp_cli_channel_interface_sasl_authentication1_callback_for_abort_sasl
>+tp_cli_channel_interface_sasl_authentication1_callback_for_accept_sasl
>+tp_cli_channel_interface_sasl_authentication1_callback_for_respond
>+tp_cli_channel_interface_sasl_authentication1_callback_for_start_mechanism
>+tp_cli_channel_interface_sasl_authentication1_callback_for_start_mechanism_with_data
>+tp_cli_channel_interface_sasl_authentication1_connect_to_new_challenge
>+tp_cli_channel_interface_sasl_authentication1_connect_to_sasl_status_changed
> <SUBSECTION Private>
>-tp_cli_channel_interface_sasl_authentication_signal_callback_new_challenge
>-tp_cli_channel_interface_sasl_authentication_signal_callback_sasl_status_changed
>+tp_cli_channel_interface_sasl_authentication1_signal_callback_new_challenge
>+tp_cli_channel_interface_sasl_authentication1_signal_callback_sasl_status_changed
> <SUBSECTION>
>-tp_cli_channel_interface_captcha_authentication_call_answer_captchas
>-tp_cli_channel_interface_captcha_authentication_call_cancel_captcha
>-tp_cli_channel_interface_captcha_authentication_call_get_captcha_data
>-tp_cli_channel_interface_captcha_authentication_call_get_captchas
>-tp_cli_channel_interface_captcha_authentication_callback_for_answer_captchas
>-tp_cli_channel_interface_captcha_authentication_callback_for_cancel_captcha
>-tp_cli_channel_interface_captcha_authentication_callback_for_get_captcha_data
>-tp_cli_channel_interface_captcha_authentication_callback_for_get_captchas
>+tp_cli_channel_interface_captcha_authentication1_call_answer_captchas
>+tp_cli_channel_interface_captcha_authentication1_call_cancel_captcha
>+tp_cli_channel_interface_captcha_authentication1_call_get_captcha_data
>+tp_cli_channel_interface_captcha_authentication1_call_get_captchas
>+tp_cli_channel_interface_captcha_authentication1_callback_for_answer_captchas
>+tp_cli_channel_interface_captcha_authentication1_callback_for_cancel_captcha
>+tp_cli_channel_interface_captcha_authentication1_callback_for_get_captcha_data
>+tp_cli_channel_interface_captcha_authentication1_callback_for_get_captchas
> </SECTION>
> 
> <SECTION>
>@@ -5405,24 +5405,24 @@ tp_file_transfer_channel_get_feature_quark_core
> <TITLE>cli-call-channel</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <SUBSECTION>
>-tp_cli_channel_type_call_call_accept
>-tp_cli_channel_type_call_call_add_content
>-tp_cli_channel_type_call_call_hangup
>-tp_cli_channel_type_call_call_set_queued
>-tp_cli_channel_type_call_call_set_ringing
>-tp_cli_channel_type_call_callback_for_accept
>-tp_cli_channel_type_call_callback_for_add_content
>-tp_cli_channel_type_call_callback_for_hangup
>-tp_cli_channel_type_call_callback_for_set_queued
>-tp_cli_channel_type_call_callback_for_set_ringing
>-tp_cli_channel_type_call_connect_to_call_members_changed
>-tp_cli_channel_type_call_connect_to_call_state_changed
>-tp_cli_channel_type_call_connect_to_content_added
>-tp_cli_channel_type_call_connect_to_content_removed
>-tp_cli_channel_type_call_signal_callback_call_members_changed
>-tp_cli_channel_type_call_signal_callback_call_state_changed
>-tp_cli_channel_type_call_signal_callback_content_added
>-tp_cli_channel_type_call_signal_callback_content_removed
>+tp_cli_channel_type_call1_call_accept
>+tp_cli_channel_type_call1_call_add_content
>+tp_cli_channel_type_call1_call_hangup
>+tp_cli_channel_type_call1_call_set_queued
>+tp_cli_channel_type_call1_call_set_ringing
>+tp_cli_channel_type_call1_callback_for_accept
>+tp_cli_channel_type_call1_callback_for_add_content
>+tp_cli_channel_type_call1_callback_for_hangup
>+tp_cli_channel_type_call1_callback_for_set_queued
>+tp_cli_channel_type_call1_callback_for_set_ringing
>+tp_cli_channel_type_call1_connect_to_call_members_changed
>+tp_cli_channel_type_call1_connect_to_call_state_changed
>+tp_cli_channel_type_call1_connect_to_content_added
>+tp_cli_channel_type_call1_connect_to_content_removed
>+tp_cli_channel_type_call1_signal_callback_call_members_changed
>+tp_cli_channel_type_call1_signal_callback_call_state_changed
>+tp_cli_channel_type_call1_signal_callback_content_added
>+tp_cli_channel_type_call1_signal_callback_content_removed
> </SECTION>
> 
> <SECTION>
>@@ -5480,60 +5480,60 @@ tp_call_channel_get_feature_quark_core
> <TITLE>cli-call-content</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <SUBSECTION>
>-tp_cli_call_content_call_remove
>-tp_cli_call_content_callback_for_remove
>-tp_cli_call_content_connect_to_streams_added
>-tp_cli_call_content_connect_to_streams_removed
>-tp_cli_call_content_signal_callback_streams_added
>-tp_cli_call_content_signal_callback_streams_removed
>-<SUBSECTION>
>-tp_cli_call_content_interface_media_call_acknowledge_dtmf_change
>-tp_cli_call_content_interface_media_call_fail
>-tp_cli_call_content_interface_media_call_update_local_media_description
>-tp_cli_call_content_interface_media_callback_for_acknowledge_dtmf_change
>-tp_cli_call_content_interface_media_callback_for_fail
>-tp_cli_call_content_interface_media_callback_for_update_local_media_description
>-tp_cli_call_content_interface_media_connect_to_dtmf_change_requested
>-tp_cli_call_content_interface_media_connect_to_local_media_description_changed
>-tp_cli_call_content_interface_media_connect_to_media_description_offer_done
>-tp_cli_call_content_interface_media_connect_to_media_descriptions_removed
>-tp_cli_call_content_interface_media_connect_to_new_media_description_offer
>-tp_cli_call_content_interface_media_connect_to_remote_media_descriptions_changed
>-tp_cli_call_content_interface_media_signal_callback_dtmf_change_requested
>-tp_cli_call_content_interface_media_signal_callback_local_media_description_changed
>-tp_cli_call_content_interface_media_signal_callback_media_description_offer_done
>-tp_cli_call_content_interface_media_signal_callback_media_descriptions_removed
>-tp_cli_call_content_interface_media_signal_callback_new_media_description_offer
>-tp_cli_call_content_interface_media_signal_callback_remote_media_descriptions_changed
>-<SUBSECTION>
>-tp_cli_call_content_interface_video_control_connect_to_bitrate_changed
>-tp_cli_call_content_interface_video_control_connect_to_framerate_changed
>-tp_cli_call_content_interface_video_control_connect_to_key_frame_requested
>-tp_cli_call_content_interface_video_control_connect_to_mtu_changed
>-tp_cli_call_content_interface_video_control_connect_to_video_resolution_changed
>-tp_cli_call_content_interface_video_control_signal_callback_bitrate_changed
>-tp_cli_call_content_interface_video_control_signal_callback_framerate_changed
>-tp_cli_call_content_interface_video_control_signal_callback_key_frame_requested
>-tp_cli_call_content_interface_video_control_signal_callback_mtu_changed
>-tp_cli_call_content_interface_video_control_signal_callback_video_resolution_changed
>-<SUBSECTION>
>-tp_cli_call_content_interface_audio_control_call_report_input_volume
>-tp_cli_call_content_interface_audio_control_call_report_output_volume
>-tp_cli_call_content_interface_audio_control_callback_for_report_input_volume
>-tp_cli_call_content_interface_audio_control_callback_for_report_output_volume
>-<SUBSECTION>
>-tp_cli_call_content_interface_dtmf_call_multiple_tones
>-tp_cli_call_content_interface_dtmf_call_start_tone
>-tp_cli_call_content_interface_dtmf_call_stop_tone
>-tp_cli_call_content_interface_dtmf_callback_for_multiple_tones
>-tp_cli_call_content_interface_dtmf_callback_for_start_tone
>-tp_cli_call_content_interface_dtmf_callback_for_stop_tone
>-tp_cli_call_content_interface_dtmf_connect_to_sending_tones
>-tp_cli_call_content_interface_dtmf_connect_to_stopped_tones
>-tp_cli_call_content_interface_dtmf_connect_to_tones_deferred
>-tp_cli_call_content_interface_dtmf_signal_callback_sending_tones
>-tp_cli_call_content_interface_dtmf_signal_callback_stopped_tones
>-tp_cli_call_content_interface_dtmf_signal_callback_tones_deferred
>+tp_cli_call1_content_call_remove
>+tp_cli_call1_content_callback_for_remove
>+tp_cli_call1_content_connect_to_streams_added
>+tp_cli_call1_content_connect_to_streams_removed
>+tp_cli_call1_content_signal_callback_streams_added
>+tp_cli_call1_content_signal_callback_streams_removed
>+<SUBSECTION>
>+tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change
>+tp_cli_call1_content_interface_media_call_fail
>+tp_cli_call1_content_interface_media_call_update_local_media_description
>+tp_cli_call1_content_interface_media_callback_for_acknowledge_dtmf_change
>+tp_cli_call1_content_interface_media_callback_for_fail
>+tp_cli_call1_content_interface_media_callback_for_update_local_media_description
>+tp_cli_call1_content_interface_media_connect_to_dtmf_change_requested
>+tp_cli_call1_content_interface_media_connect_to_local_media_description_changed
>+tp_cli_call1_content_interface_media_connect_to_media_description_offer_done
>+tp_cli_call1_content_interface_media_connect_to_media_descriptions_removed
>+tp_cli_call1_content_interface_media_connect_to_new_media_description_offer
>+tp_cli_call1_content_interface_media_connect_to_remote_media_descriptions_changed
>+tp_cli_call1_content_interface_media_signal_callback_dtmf_change_requested
>+tp_cli_call1_content_interface_media_signal_callback_local_media_description_changed
>+tp_cli_call1_content_interface_media_signal_callback_media_description_offer_done
>+tp_cli_call1_content_interface_media_signal_callback_media_descriptions_removed
>+tp_cli_call1_content_interface_media_signal_callback_new_media_description_offer
>+tp_cli_call1_content_interface_media_signal_callback_remote_media_descriptions_changed
>+<SUBSECTION>
>+tp_cli_call1_content_interface_video_control1_connect_to_bitrate_changed
>+tp_cli_call1_content_interface_video_control1_connect_to_framerate_changed
>+tp_cli_call1_content_interface_video_control1_connect_to_key_frame_requested
>+tp_cli_call1_content_interface_video_control1_connect_to_mtu_changed
>+tp_cli_call1_content_interface_video_control1_connect_to_video_resolution_changed
>+tp_cli_call1_content_interface_video_control1_signal_callback_bitrate_changed
>+tp_cli_call1_content_interface_video_control1_signal_callback_framerate_changed
>+tp_cli_call1_content_interface_video_control1_signal_callback_key_frame_requested
>+tp_cli_call1_content_interface_video_control1_signal_callback_mtu_changed
>+tp_cli_call1_content_interface_video_control1_signal_callback_video_resolution_changed
>+<SUBSECTION>
>+tp_cli_call1_content_interface_audio_control1_call_report_input_volume
>+tp_cli_call1_content_interface_audio_control1_call_report_output_volume
>+tp_cli_call1_content_interface_audio_control1_callback_for_report_input_volume
>+tp_cli_call1_content_interface_audio_control1_callback_for_report_output_volume
>+<SUBSECTION>
>+tp_cli_call1_content_interface_dtmf1_call_multiple_tones
>+tp_cli_call1_content_interface_dtmf1_call_start_tone
>+tp_cli_call1_content_interface_dtmf1_call_stop_tone
>+tp_cli_call1_content_interface_dtmf1_callback_for_multiple_tones
>+tp_cli_call1_content_interface_dtmf1_callback_for_start_tone
>+tp_cli_call1_content_interface_dtmf1_callback_for_stop_tone
>+tp_cli_call1_content_interface_dtmf1_connect_to_sending_tones
>+tp_cli_call1_content_interface_dtmf1_connect_to_stopped_tones
>+tp_cli_call1_content_interface_dtmf1_connect_to_tones_deferred
>+tp_cli_call1_content_interface_dtmf1_signal_callback_sending_tones
>+tp_cli_call1_content_interface_dtmf1_signal_callback_stopped_tones
>+tp_cli_call1_content_interface_dtmf1_signal_callback_tones_deferred
> <SUBSECTION Standard>
> tp_cli_call_content_add_signals
> </SECTION>
>@@ -5575,49 +5575,49 @@ tp_call_content_get_feature_quark_core
> <TITLE>cli-call-stream</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
> <SUBSECTION>
>-tp_cli_call_stream_call_request_receiving
>-tp_cli_call_stream_call_set_sending
>-tp_cli_call_stream_callback_for_request_receiving
>-tp_cli_call_stream_callback_for_set_sending
>-tp_cli_call_stream_connect_to_local_sending_state_changed
>-tp_cli_call_stream_connect_to_remote_members_changed
>-tp_cli_call_stream_signal_callback_local_sending_state_changed
>-tp_cli_call_stream_signal_callback_remote_members_changed
>-<SUBSECTION>
>-tp_cli_call_stream_interface_media_call_add_candidates
>-tp_cli_call_stream_interface_media_call_complete_receiving_state_change
>-tp_cli_call_stream_interface_media_call_complete_sending_state_change
>-tp_cli_call_stream_interface_media_call_fail
>-tp_cli_call_stream_interface_media_call_finish_initial_candidates
>-tp_cli_call_stream_interface_media_call_report_receiving_failure
>-tp_cli_call_stream_interface_media_call_report_sending_failure
>-tp_cli_call_stream_interface_media_call_set_credentials
>-tp_cli_call_stream_interface_media_callback_for_add_candidates
>-tp_cli_call_stream_interface_media_callback_for_complete_receiving_state_change
>-tp_cli_call_stream_interface_media_callback_for_complete_sending_state_change
>-tp_cli_call_stream_interface_media_callback_for_fail
>-tp_cli_call_stream_interface_media_callback_for_finish_initial_candidates
>-tp_cli_call_stream_interface_media_callback_for_report_receiving_failure
>-tp_cli_call_stream_interface_media_callback_for_report_sending_failure
>-tp_cli_call_stream_interface_media_callback_for_set_credentials
>-tp_cli_call_stream_interface_media_connect_to_endpoints_changed
>-tp_cli_call_stream_interface_media_connect_to_ice_restart_requested
>-tp_cli_call_stream_interface_media_connect_to_local_candidates_added
>-tp_cli_call_stream_interface_media_connect_to_local_credentials_changed
>-tp_cli_call_stream_interface_media_connect_to_receiving_state_changed
>-tp_cli_call_stream_interface_media_connect_to_relay_info_changed
>-tp_cli_call_stream_interface_media_connect_to_sending_state_changed
>-tp_cli_call_stream_interface_media_connect_to_server_info_retrieved
>-tp_cli_call_stream_interface_media_connect_to_stun_servers_changed
>-tp_cli_call_stream_interface_media_signal_callback_endpoints_changed
>-tp_cli_call_stream_interface_media_signal_callback_ice_restart_requested
>-tp_cli_call_stream_interface_media_signal_callback_local_candidates_added
>-tp_cli_call_stream_interface_media_signal_callback_local_credentials_changed
>-tp_cli_call_stream_interface_media_signal_callback_receiving_state_changed
>-tp_cli_call_stream_interface_media_signal_callback_relay_info_changed
>-tp_cli_call_stream_interface_media_signal_callback_sending_state_changed
>-tp_cli_call_stream_interface_media_signal_callback_server_info_retrieved
>-tp_cli_call_stream_interface_media_signal_callback_stun_servers_changed
>+tp_cli_call1_stream_call_request_receiving
>+tp_cli_call1_stream_call_set_sending
>+tp_cli_call1_stream_callback_for_request_receiving
>+tp_cli_call1_stream_callback_for_set_sending
>+tp_cli_call1_stream_connect_to_local_sending_state_changed
>+tp_cli_call1_stream_connect_to_remote_members_changed
>+tp_cli_call1_stream_signal_callback_local_sending_state_changed
>+tp_cli_call1_stream_signal_callback_remote_members_changed
>+<SUBSECTION>
>+tp_cli_call1_stream_interface_media_call_add_candidates
>+tp_cli_call1_stream_interface_media_call_complete_receiving_state_change
>+tp_cli_call1_stream_interface_media_call_complete_sending_state_change
>+tp_cli_call1_stream_interface_media_call_fail
>+tp_cli_call1_stream_interface_media_call_finish_initial_candidates
>+tp_cli_call1_stream_interface_media_call_report_receiving_failure
>+tp_cli_call1_stream_interface_media_call_report_sending_failure
>+tp_cli_call1_stream_interface_media_call_set_credentials
>+tp_cli_call1_stream_interface_media_callback_for_add_candidates
>+tp_cli_call1_stream_interface_media_callback_for_complete_receiving_state_change
>+tp_cli_call1_stream_interface_media_callback_for_complete_sending_state_change
>+tp_cli_call1_stream_interface_media_callback_for_fail
>+tp_cli_call1_stream_interface_media_callback_for_finish_initial_candidates
>+tp_cli_call1_stream_interface_media_callback_for_report_receiving_failure
>+tp_cli_call1_stream_interface_media_callback_for_report_sending_failure
>+tp_cli_call1_stream_interface_media_callback_for_set_credentials
>+tp_cli_call1_stream_interface_media_connect_to_endpoints_changed
>+tp_cli_call1_stream_interface_media_connect_to_ice_restart_requested
>+tp_cli_call1_stream_interface_media_connect_to_local_candidates_added
>+tp_cli_call1_stream_interface_media_connect_to_local_credentials_changed
>+tp_cli_call1_stream_interface_media_connect_to_receiving_state_changed
>+tp_cli_call1_stream_interface_media_connect_to_relay_info_changed
>+tp_cli_call1_stream_interface_media_connect_to_sending_state_changed
>+tp_cli_call1_stream_interface_media_connect_to_server_info_retrieved
>+tp_cli_call1_stream_interface_media_connect_to_stun_servers_changed
>+tp_cli_call1_stream_interface_media_signal_callback_endpoints_changed
>+tp_cli_call1_stream_interface_media_signal_callback_ice_restart_requested
>+tp_cli_call1_stream_interface_media_signal_callback_local_candidates_added
>+tp_cli_call1_stream_interface_media_signal_callback_local_credentials_changed
>+tp_cli_call1_stream_interface_media_signal_callback_receiving_state_changed
>+tp_cli_call1_stream_interface_media_signal_callback_relay_info_changed
>+tp_cli_call1_stream_interface_media_signal_callback_sending_state_changed
>+tp_cli_call1_stream_interface_media_signal_callback_server_info_retrieved
>+tp_cli_call1_stream_interface_media_signal_callback_stun_servers_changed
> <SUBSECTION Standard>
> tp_cli_call_stream_add_signals
> </SECTION>
>@@ -5656,31 +5656,31 @@ tp_call_stream_get_feature_quark_core
> <FILE>cli-call-misc</FILE>
> <TITLE>cli-call-misc</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-tp_cli_call_content_media_description_call_accept
>-tp_cli_call_content_media_description_call_reject
>-tp_cli_call_content_media_description_callback_for_accept
>-tp_cli_call_content_media_description_callback_for_reject
>-<SUBSECTION>
>-tp_cli_call_stream_endpoint_call_accept_selected_candidate_pair
>-tp_cli_call_stream_endpoint_call_reject_selected_candidate_pair
>-tp_cli_call_stream_endpoint_call_set_controlling
>-tp_cli_call_stream_endpoint_call_set_endpoint_state
>-tp_cli_call_stream_endpoint_call_set_selected_candidate_pair
>-tp_cli_call_stream_endpoint_callback_for_accept_selected_candidate_pair
>-tp_cli_call_stream_endpoint_callback_for_reject_selected_candidate_pair
>-tp_cli_call_stream_endpoint_callback_for_set_controlling
>-tp_cli_call_stream_endpoint_callback_for_set_endpoint_state
>-tp_cli_call_stream_endpoint_callback_for_set_selected_candidate_pair
>-tp_cli_call_stream_endpoint_connect_to_candidate_pair_selected
>-tp_cli_call_stream_endpoint_connect_to_controlling_changed
>-tp_cli_call_stream_endpoint_connect_to_endpoint_state_changed
>-tp_cli_call_stream_endpoint_connect_to_remote_candidates_added
>-tp_cli_call_stream_endpoint_connect_to_remote_credentials_set
>-tp_cli_call_stream_endpoint_signal_callback_candidate_pair_selected
>-tp_cli_call_stream_endpoint_signal_callback_controlling_changed
>-tp_cli_call_stream_endpoint_signal_callback_endpoint_state_changed
>-tp_cli_call_stream_endpoint_signal_callback_remote_candidates_added
>-tp_cli_call_stream_endpoint_signal_callback_remote_credentials_set
>+tp_cli_call1_content_media_description_call_accept
>+tp_cli_call1_content_media_description_call_reject
>+tp_cli_call1_content_media_description_callback_for_accept
>+tp_cli_call1_content_media_description_callback_for_reject
>+<SUBSECTION>
>+tp_cli_call1_stream_endpoint_call_accept_selected_candidate_pair
>+tp_cli_call1_stream_endpoint_call_reject_selected_candidate_pair
>+tp_cli_call1_stream_endpoint_call_set_controlling
>+tp_cli_call1_stream_endpoint_call_set_endpoint_state
>+tp_cli_call1_stream_endpoint_call_set_selected_candidate_pair
>+tp_cli_call1_stream_endpoint_callback_for_accept_selected_candidate_pair
>+tp_cli_call1_stream_endpoint_callback_for_reject_selected_candidate_pair
>+tp_cli_call1_stream_endpoint_callback_for_set_controlling
>+tp_cli_call1_stream_endpoint_callback_for_set_endpoint_state
>+tp_cli_call1_stream_endpoint_callback_for_set_selected_candidate_pair
>+tp_cli_call1_stream_endpoint_connect_to_candidate_pair_selected
>+tp_cli_call1_stream_endpoint_connect_to_controlling_changed
>+tp_cli_call1_stream_endpoint_connect_to_endpoint_state_changed
>+tp_cli_call1_stream_endpoint_connect_to_remote_candidates_added
>+tp_cli_call1_stream_endpoint_connect_to_remote_credentials_set
>+tp_cli_call1_stream_endpoint_signal_callback_candidate_pair_selected
>+tp_cli_call1_stream_endpoint_signal_callback_controlling_changed
>+tp_cli_call1_stream_endpoint_signal_callback_endpoint_state_changed
>+tp_cli_call1_stream_endpoint_signal_callback_remote_candidates_added
>+tp_cli_call1_stream_endpoint_signal_callback_remote_credentials_set
> <SUBSECTION Standard>
> tp_cli_call_content_media_description_add_signals
> tp_cli_call_stream_endpoint_add_signals
>@@ -5759,14 +5759,14 @@ tp_automatic_client_factory_get_type
> <FILE>svc-channel-ft-metadata</FILE>
> <TITLE>svc-channel-ft-metadata</TITLE>
> <INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
>-TpSvcChannelInterfaceFileTransferMetadata
>-TpSvcChannelInterfaceFileTransferMetadataClass
>+TpSvcChannelInterfaceFileTransferMetadata1
>+TpSvcChannelInterfaceFileTransferMetadata1Class
> <SUBSECTION Standard>
>-TP_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA
>-TP_IS_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA
>-TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA
>-tp_svc_channel_interface_file_transfer_metadata_get_type
>-TP_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_GET_CLASS
>+TP_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
>+TP_IS_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
>+TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1
>+tp_svc_channel_interface_file_transfer_metadata1_get_type
>+TP_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_GET_CLASS
> </SECTION>
> 
> <SECTION>
>@@ -6029,10 +6029,10 @@ tp_debug_client_get_feature_quark_core
> tp_cli_debug_add_signals
> <SUBSECTION Private>
> TpDebugClientPrivate
>-tp_cli_debug_call_get_messages
>-tp_cli_debug_callback_for_get_messages
>-tp_cli_debug_connect_to_new_debug_message
>-tp_cli_debug_signal_callback_new_debug_message
>+tp_cli_debug1_call_get_messages
>+tp_cli_debug1_callback_for_get_messages
>+tp_cli_debug1_connect_to_new_debug_message
>+tp_cli_debug1_signal_callback_new_debug_message
> </SECTION>
> 
> <SECTION>
>diff --git a/examples/client/approver.c b/examples/client/approver.c
>index 67ef28a..7da0eff 100644
>--- a/examples/client/approver.c
>+++ b/examples/client/approver.c
>@@ -177,7 +177,7 @@ main (int argc,
>   /* file transfer */
>   tp_base_client_take_approver_filter (approver, tp_asv_new (
>         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_CONTACT,
>         NULL));
>diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
>index 6d39091..fe8362c 100644
>--- a/examples/client/dbus-tubes/accepter.c
>+++ b/examples/client/dbus-tubes/accepter.c
>@@ -195,13 +195,13 @@ main (int argc,
>   tp_base_client_take_handler_filter (handler, tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE,
>       G_TYPE_STRING,
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
> 
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>       G_TYPE_UINT,
>       TP_HANDLE_TYPE_CONTACT,
> 
>-      TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME,
>+      TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME,
>       G_TYPE_STRING,
>       EXAMPLE_SERVICE_NAME,
> 
>diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
>index 8d9d188..396d409 100644
>--- a/examples/client/dbus-tubes/offerer.c
>+++ b/examples/client/dbus-tubes/offerer.c
>@@ -208,7 +208,7 @@ main (int argc,
>   request = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE,
>       G_TYPE_STRING,
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
> 
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>       G_TYPE_UINT,
>@@ -218,7 +218,7 @@ main (int argc,
>       G_TYPE_STRING,
>       argv[2],
> 
>-      TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME,
>+      TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME,
>       G_TYPE_STRING,
>       EXAMPLE_SERVICE_NAME,
> 
>diff --git a/examples/client/inspect-channel.c b/examples/client/inspect-channel.c
>index 01ecc75..5a39c54 100644
>--- a/examples/client/inspect-channel.c
>+++ b/examples/client/inspect-channel.c
>@@ -63,7 +63,7 @@ channel_ready_cb (GObject *source,
>   g_strfreev (interfaces);
> 
>   if (tp_proxy_has_interface_by_id (channel,
>-        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
>+        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1))
>     {
>       GPtrArray *members = tp_channel_group_dup_members (channel);
>       guint i;
>diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
>index c0e9e33..3f298ef 100644
>--- a/examples/client/stream-tubes/accepter.c
>+++ b/examples/client/stream-tubes/accepter.c
>@@ -145,13 +145,13 @@ main (int argc,
>   tp_base_client_take_handler_filter (handler, tp_asv_new (
>         TP_PROP_CHANNEL_CHANNEL_TYPE,
>         G_TYPE_STRING,
>-        TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+        TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
> 
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>         G_TYPE_UINT,
>         TP_HANDLE_TYPE_CONTACT,
> 
>-        TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE,
>+        TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE,
>         G_TYPE_STRING,
>         "ExampleService",
> 
>diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
>index 212a686..2e9134a 100644
>--- a/examples/client/stream-tubes/offerer.c
>+++ b/examples/client/stream-tubes/offerer.c
>@@ -160,7 +160,7 @@ main (int argc,
>   request = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE,
>       G_TYPE_STRING,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
> 
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>       G_TYPE_UINT,
>@@ -170,7 +170,7 @@ main (int argc,
>       G_TYPE_STRING,
>       argv[2],
> 
>-      TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE,
>+      TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE,
>       G_TYPE_STRING,
>       "ExampleService",
> 
>diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c
>index a306155..39d1c67 100644
>--- a/examples/cm/call/call-channel.c
>+++ b/examples/cm/call/call-channel.c
>@@ -53,7 +53,7 @@ static void hold_iface_init (gpointer iface, gpointer data);
> G_DEFINE_TYPE_WITH_CODE (ExampleCallChannel,
>     example_call_channel,
>     TP_TYPE_BASE_MEDIA_CALL_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD1,
>       hold_iface_init))
> 
> enum
>@@ -84,7 +84,7 @@ example_call_channel_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       example_call_channel_parent_class)->get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD1);
>   return interfaces;
> }
> 
>@@ -701,7 +701,7 @@ simulate_hold (gpointer p)
> 
>   self->priv->hold_state = TP_LOCAL_HOLD_STATE_HELD;
>   g_message ("SIGNALLING: hold state changed to held");
>-  tp_svc_channel_interface_hold_emit_hold_state_changed (self,
>+  tp_svc_channel_interface_hold1_emit_hold_state_changed (self,
>       self->priv->hold_state, self->priv->hold_state_reason);
> 
>   example_call_channel_set_state (self, call_state,
>@@ -722,7 +722,7 @@ simulate_unhold (gpointer p)
> 
>   self->priv->hold_state = TP_LOCAL_HOLD_STATE_UNHELD;
>   g_message ("SIGNALLING: hold state changed to unheld");
>-  tp_svc_channel_interface_hold_emit_hold_state_changed (self,
>+  tp_svc_channel_interface_hold1_emit_hold_state_changed (self,
>       self->priv->hold_state, self->priv->hold_state_reason);
> 
>   example_call_channel_set_state (self, call_state,
>@@ -741,7 +741,7 @@ simulate_inability_to_unhold (gpointer p)
>   self->priv->hold_state = TP_LOCAL_HOLD_STATE_PENDING_HOLD;
>   g_message ("SIGNALLING: unable to unhold - hold state changed to "
>       "pending hold");
>-  tp_svc_channel_interface_hold_emit_hold_state_changed (self,
>+  tp_svc_channel_interface_hold1_emit_hold_state_changed (self,
>       self->priv->hold_state, self->priv->hold_state_reason);
>   /* hold again */
>   g_timeout_add_full (G_PRIORITY_DEFAULT,
>@@ -752,17 +752,17 @@ simulate_inability_to_unhold (gpointer p)
> }
> 
> static void
>-hold_get_hold_state (TpSvcChannelInterfaceHold *iface,
>+hold_get_hold_state (TpSvcChannelInterfaceHold1 *iface,
>     DBusGMethodInvocation *context)
> {
>   ExampleCallChannel *self = EXAMPLE_CALL_CHANNEL (iface);
> 
>-  tp_svc_channel_interface_hold_return_from_get_hold_state (context,
>+  tp_svc_channel_interface_hold1_return_from_get_hold_state (context,
>       self->priv->hold_state, self->priv->hold_state_reason);
> }
> 
> static void
>-hold_request_hold (TpSvcChannelInterfaceHold *iface,
>+hold_request_hold (TpSvcChannelInterfaceHold1 *iface,
>     gboolean hold,
>     DBusGMethodInvocation *context)
> {
>@@ -776,7 +776,7 @@ hold_request_hold (TpSvcChannelInterfaceHold *iface,
>   if ((hold && self->priv->hold_state == TP_LOCAL_HOLD_STATE_HELD) ||
>       (!hold && self->priv->hold_state == TP_LOCAL_HOLD_STATE_UNHELD))
>     {
>-      tp_svc_channel_interface_hold_return_from_request_hold (context);
>+      tp_svc_channel_interface_hold1_return_from_request_hold (context);
>       return;
>     }
> 
>@@ -814,7 +814,7 @@ hold_request_hold (TpSvcChannelInterfaceHold *iface,
> 
>   g_message ("SIGNALLING: hold state changed to pending %s",
>              (hold ? "hold" : "unhold"));
>-  tp_svc_channel_interface_hold_emit_hold_state_changed (iface,
>+  tp_svc_channel_interface_hold1_emit_hold_state_changed (iface,
>     self->priv->hold_state, self->priv->hold_state_reason);
>   /* No need to change the call flags - we never change the actual hold state
>    * here, only the pending hold state */
>@@ -824,7 +824,7 @@ hold_request_hold (TpSvcChannelInterfaceHold *iface,
>       callback, g_object_ref (self),
>       g_object_unref);
> 
>-  tp_svc_channel_interface_hold_return_from_request_hold (context);
>+  tp_svc_channel_interface_hold1_return_from_request_hold (context);
>   return;
> 
> error:
>@@ -837,10 +837,10 @@ void
> hold_iface_init (gpointer iface,
>     gpointer data)
> {
>-  TpSvcChannelInterfaceHoldClass *klass = iface;
>+  TpSvcChannelInterfaceHold1Class *klass = iface;
> 
> #define IMPLEMENT(x) \
>-  tp_svc_channel_interface_hold_implement_##x (klass, hold_##x)
>+  tp_svc_channel_interface_hold1_implement_##x (klass, hold_##x)
>   IMPLEMENT (get_hold_state);
>   IMPLEMENT (request_hold);
> #undef IMPLEMENT
>diff --git a/examples/cm/call/call-manager.c b/examples/cm/call/call-manager.c
>index de2e38a..c39d037 100644
>--- a/examples/cm/call/call-manager.c
>+++ b/examples/cm/call/call-manager.c
>@@ -356,28 +356,28 @@ new_channel (ExampleCallManager *self,
> static const gchar * const audio_fixed_properties[] = {
>     TP_PROP_CHANNEL_CHANNEL_TYPE,
>     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>     NULL
> };
> 
> static const gchar * const video_fixed_properties[] = {
>     TP_PROP_CHANNEL_CHANNEL_TYPE,
>     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>     NULL
> };
> 
> static const gchar * const audio_allowed_properties[] = {
>     TP_PROP_CHANNEL_TARGET_HANDLE,
>     TP_PROP_CHANNEL_TARGET_ID,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>     NULL
> };
> 
> static const gchar * const video_allowed_properties[] = {
>     TP_PROP_CHANNEL_TARGET_HANDLE,
>     TP_PROP_CHANNEL_TARGET_ID,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>     NULL
> };
> 
>@@ -388,15 +388,15 @@ example_call_manager_type_foreach_channel_class (GType type,
> {
>   GHashTable *table = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE,
>-          G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL,
>+          G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
>       NULL);
> 
>   func (type, table, audio_allowed_properties, user_data);
> 
>-  g_hash_table_remove (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO);
>-  tp_asv_set_boolean (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>+  g_hash_table_remove (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO);
>+  tp_asv_set_boolean (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>       TRUE);
> 
>   func (type, table, video_allowed_properties, user_data);
>@@ -416,7 +416,7 @@ example_call_manager_request (ExampleCallManager *self,
> 
>   if (tp_strdiff (tp_asv_get_string (request_properties,
>           TP_PROP_CHANNEL_CHANNEL_TYPE),
>-      TP_IFACE_CHANNEL_TYPE_CALL))
>+      TP_IFACE_CHANNEL_TYPE_CALL1))
>     {
>       return FALSE;
>     }
>@@ -432,9 +432,9 @@ example_call_manager_request (ExampleCallManager *self,
>   g_assert (handle != 0);
> 
>   initial_audio = tp_asv_get_boolean (request_properties,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL);
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL);
>   initial_video = tp_asv_get_boolean (request_properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL);
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL);
> 
>   if (!initial_audio && !initial_video)
>     {
>diff --git a/examples/cm/call/conn.c b/examples/cm/call/conn.c
>index 87c5485..c3a736f 100644
>--- a/examples/cm/call/conn.c
>+++ b/examples/cm/call/conn.c
>@@ -36,7 +36,7 @@ G_DEFINE_TYPE_WITH_CODE (ExampleCallConnection,
>     TP_TYPE_BASE_CONNECTION,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
>       tp_contacts_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
>       tp_presence_mixin_iface_init))
> 
> enum
>@@ -362,7 +362,7 @@ static const TpPresenceStatusSpec presence_statuses[] = {
> 
> static const gchar *interfaces_always_present[] = {
>     TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
>-    TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>+    TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>     TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
>     NULL };
> 
>diff --git a/examples/cm/channelspecific/room.c b/examples/cm/channelspecific/room.c
>index 4c805c7..ea57770 100644
>--- a/examples/cm/channelspecific/room.c
>+++ b/examples/cm/channelspecific/room.c
>@@ -19,7 +19,7 @@ G_DEFINE_TYPE_WITH_CODE (ExampleCSHRoomChannel,
>     TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
>       tp_message_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>       tp_group_mixin_iface_init);)
> 
> /* type definition stuff */
>@@ -43,7 +43,7 @@ example_csh_room_channel_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (example_csh_room_channel_parent_class)->
>     get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP1);
>   return interfaces;
> };
> 
>diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c
>index caec16e..e3ddd33 100644
>--- a/examples/cm/contactlist/conn.c
>+++ b/examples/cm/contactlist/conn.c
>@@ -28,17 +28,17 @@ G_DEFINE_TYPE_WITH_CODE (ExampleContactListConnection,
>     TP_TYPE_BASE_CONNECTION,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>        tp_dbus_properties_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1,
>       init_aliasing);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
>       tp_contacts_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1,
>       tp_base_contact_list_mixin_list_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>       tp_base_contact_list_mixin_groups_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
>       tp_base_contact_list_mixin_blocking_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
>         tp_presence_mixin_iface_init))
> 
> enum
>@@ -167,7 +167,7 @@ alias_updated_cb (ExampleContactList *contact_list,
>   g_hash_table_insert (aliases, GUINT_TO_POINTER (contact),
>       (gpointer) example_contact_list_get_alias (contact_list, contact));
> 
>-  tp_svc_connection_interface_aliasing_emit_aliases_changed (self, aliases);
>+  tp_svc_connection_interface_aliasing1_emit_aliases_changed (self, aliases);
> 
>   g_hash_table_unref (aliases);
> }
>@@ -248,7 +248,7 @@ aliasing_fill_contact_attributes (GObject *object,
>       TpHandle contact = g_array_index (contacts, guint, i);
> 
>       tp_contacts_mixin_set_contact_attribute (attributes, contact,
>-          TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS,
>+          TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS,
>           tp_g_value_slice_new_string (
>             example_contact_list_get_alias (self->priv->contact_list,
>               contact)));
>@@ -286,7 +286,7 @@ constructed (GObject *object)
>       TP_BASE_CONTACT_LIST (self->priv->contact_list), base);
> 
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>       aliasing_fill_contact_attributes);
> 
>   tp_presence_mixin_init (object,
>@@ -379,12 +379,12 @@ set_own_status (GObject *object,
> }
> 
> static const gchar *interfaces_always_present[] = {
>-    TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+    TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>     TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>-    TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
>+    TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>     TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
>     NULL };
> 
>@@ -447,7 +447,7 @@ example_contact_list_connection_class_init (
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-        { TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+        { TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>           aliasing_get_dbus_property,
>           NULL,
>           aliasing_props,
>@@ -498,7 +498,7 @@ example_contact_list_connection_class_init (
> }
> 
> static void
>-request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
>+request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
>                  const GArray *contacts,
>                  DBusGMethodInvocation *context)
> {
>@@ -534,13 +534,13 @@ request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
> 
>   g_ptr_array_add (result, NULL);
>   strings = (gchar **) g_ptr_array_free (result, FALSE);
>-  tp_svc_connection_interface_aliasing_return_from_request_aliases (context,
>+  tp_svc_connection_interface_aliasing1_return_from_request_aliases (context,
>       (const gchar **) strings);
>   g_free (strings);
> }
> 
> static void
>-set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
>+set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
>              GHashTable *aliases,
>              DBusGMethodInvocation *context)
> {
>@@ -575,16 +575,16 @@ set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
>           GPOINTER_TO_UINT (key), value);
>     }
> 
>-  tp_svc_connection_interface_aliasing_return_from_set_aliases (context);
>+  tp_svc_connection_interface_aliasing1_return_from_set_aliases (context);
> }
> 
> static void
> init_aliasing (gpointer iface,
>                gpointer iface_data G_GNUC_UNUSED)
> {
>-  TpSvcConnectionInterfaceAliasingClass *klass = iface;
>+  TpSvcConnectionInterfaceAliasing1Class *klass = iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_aliasing_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_aliasing1_implement_##x (\
>     klass, x)
>   IMPLEMENT(request_aliases);
>   IMPLEMENT(set_aliases);
>diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c
>index da4ba6a..feecfeb 100644
>--- a/examples/cm/echo-message-parts/chan.c
>+++ b/examples/cm/echo-message-parts/chan.c
>@@ -26,11 +26,11 @@ G_DEFINE_TYPE_WITH_CODE (ExampleEcho2Channel,
>     TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
>       tp_message_mixin_iface_init)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE1,
>       tp_message_mixin_chat_state_iface_init)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1,
>       destroyable_iface_init)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, sms_iface_init)
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SMS1, sms_iface_init)
>     )
> 
> /* type definition stuff */
>@@ -43,9 +43,9 @@ example_echo_2_channel_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (example_echo_2_channel_parent_class)->
>     get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SMS);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SMS1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1);
> 
>   return interfaces;
> };
>@@ -267,7 +267,7 @@ example_echo_2_channel_fill_immutable_properties (TpBaseChannel *chan,
>       TP_IFACE_CHANNEL_TYPE_TEXT, "DeliveryReportingSupport",
>       TP_IFACE_CHANNEL_TYPE_TEXT, "SupportedContentTypes",
>       TP_IFACE_CHANNEL_TYPE_TEXT, "MessageTypes",
>-      TP_IFACE_CHANNEL_INTERFACE_SMS, "Flash",
>+      TP_IFACE_CHANNEL_INTERFACE_SMS1, "Flash",
>       NULL);
> }
> 
>@@ -339,19 +339,19 @@ example_echo_2_channel_class_init (ExampleEcho2ChannelClass *klass)
>     example_echo_2_channel_fill_immutable_properties;
> 
>   param_spec = g_param_spec_boolean ("sms", "SMS",
>-      "SMS.SMSChannel",
>+      "SMS1.SMSChannel",
>       FALSE,
>       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
>   g_object_class_install_property (object_class, PROP_SMS, param_spec);
> 
>   param_spec = g_param_spec_boolean ("sms-flash", "SMS Flash",
>-      "SMS.Flash",
>+      "SMS1.Flash",
>       FALSE,
>       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
>   g_object_class_install_property (object_class, PROP_SMS_FLASH, param_spec);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       sms_props);
> 
>@@ -359,7 +359,7 @@ example_echo_2_channel_class_init (ExampleEcho2ChannelClass *klass)
> }
> 
> static void
>-destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface,
>+destroyable_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
>     DBusGMethodInvocation *context)
> {
>   TpBaseChannel *self = TP_BASE_CHANNEL (iface);
>@@ -367,17 +367,17 @@ destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface,
>   tp_message_mixin_clear ((GObject *) self);
>   example_echo_2_channel_close (self);
>   g_assert (tp_base_channel_is_destroyed (self));
>-  tp_svc_channel_interface_destroyable_return_from_destroy (context);
>+  tp_svc_channel_interface_destroyable1_return_from_destroy (context);
> }
> 
> static void
> destroyable_iface_init (gpointer iface,
>     gpointer data)
> {
>-  TpSvcChannelInterfaceDestroyableClass *klass = iface;
>+  TpSvcChannelInterfaceDestroyable1Class *klass = iface;
> 
> #define IMPLEMENT(x) \
>-  tp_svc_channel_interface_destroyable_implement_##x (klass, destroyable_##x)
>+  tp_svc_channel_interface_destroyable1_implement_##x (klass, destroyable_##x)
>   IMPLEMENT (destroy);
> #undef IMPLEMENT
> }
>@@ -392,11 +392,11 @@ example_echo_2_channel_set_sms (ExampleEcho2Channel *self,
> 
>   self->priv->sms = sms;
> 
>-  tp_svc_channel_interface_sms_emit_sms_channel_changed (self, sms);
>+  tp_svc_channel_interface_sms1_emit_sms_channel_changed (self, sms);
> }
> 
> static void
>-sms_get_sms_length (TpSvcChannelInterfaceSMS *self,
>+sms_get_sms_length (TpSvcChannelInterfaceSMS1 *self,
>     const GPtrArray *parts,
>     DBusGMethodInvocation *context)
> {
>@@ -424,7 +424,7 @@ sms_get_sms_length (TpSvcChannelInterfaceSMS *self,
>   txt = tp_message_to_text (message);
>   len = strlen (txt);
> 
>-  tp_svc_channel_interface_sms_return_from_get_sms_length (context, len,
>+  tp_svc_channel_interface_sms1_return_from_get_sms_length (context, len,
>       EXAMPLE_ECHO_2_CHANNEL_MAX_SMS_LENGTH - len, -1);
> 
>   g_object_unref (message);
>@@ -435,10 +435,10 @@ static void
> sms_iface_init (gpointer iface,
>     gpointer data)
> {
>-  TpSvcChannelInterfaceSMSClass *klass = iface;
>+  TpSvcChannelInterfaceSMS1Class *klass = iface;
> 
> #define IMPLEMENT(x) \
>-  tp_svc_channel_interface_sms_implement_##x (klass, sms_##x)
>+  tp_svc_channel_interface_sms1_implement_##x (klass, sms_##x)
>   IMPLEMENT (get_sms_length);
> #undef IMPLEMENT
> }
>diff --git a/examples/cm/echo-message-parts/protocol.c b/examples/cm/echo-message-parts/protocol.c
>index ad80a14..ef31350 100644
>--- a/examples/cm/echo-message-parts/protocol.c
>+++ b/examples/cm/echo-message-parts/protocol.c
>@@ -131,8 +131,8 @@ get_interfaces_array (TpBaseProtocol *self)
>   interfaces = TP_BASE_PROTOCOL_CLASS (
>       example_echo_2_protocol_parent_class)->get_interfaces_array (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS);
>-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING);
>+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS1);
>+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1);
> 
>   return interfaces;
> }
>diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
>index 110756e..546aafd 100644
>--- a/telepathy-glib/account-channel-request.c
>+++ b/telepathy-glib/account-channel-request.c
>@@ -1815,8 +1815,8 @@ tp_account_channel_request_new_audio_call (
>   g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
> 
>   request = tp_asv_new (
>-      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
>+      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
>       NULL);
> 
>   self = g_object_new (TP_TYPE_ACCOUNT_CHANNEL_REQUEST,
>@@ -1864,9 +1864,9 @@ tp_account_channel_request_new_audio_video_call (
>   g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
> 
>   request = tp_asv_new (
>-      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
>+      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
>       NULL);
> 
>   self = g_object_new (TP_TYPE_ACCOUNT_CHANNEL_REQUEST,
>@@ -1926,10 +1926,10 @@ tp_account_channel_request_new_file_transfer (
> 
>   request = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, filename,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, mime_type,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, size,
>+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME, G_TYPE_STRING, filename,
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING, mime_type,
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, G_TYPE_UINT64, size,
>       NULL);
> 
>   self = g_object_new (TP_TYPE_ACCOUNT_CHANNEL_REQUEST,
>@@ -1970,7 +1970,7 @@ tp_account_channel_request_set_file_transfer_description (
>   g_return_if_fail (description != NULL);
> 
>   g_hash_table_insert (self->priv->request,
>-      g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION),
>+      g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION),
>       tp_g_value_slice_new_string (description));
> }
> 
>@@ -2018,7 +2018,7 @@ tp_account_channel_request_set_file_transfer_uri (
>   g_return_if_fail (uri != NULL);
> 
>   g_hash_table_insert (self->priv->request,
>-      g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI),
>+      g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI),
>       tp_g_value_slice_new_string (uri));
> }
> 
>@@ -2052,7 +2052,7 @@ tp_account_channel_request_set_file_transfer_timestamp (
>   g_return_if_fail (!self->priv->requested);
> 
>   g_hash_table_insert (self->priv->request,
>-      g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE),
>+      g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE),
>       tp_g_value_slice_new_uint64 (timestamp));
> }
> 
>@@ -2090,12 +2090,12 @@ tp_account_channel_request_set_file_transfer_initial_offset (
>   if (offset == 0)
>     {
>       g_hash_table_remove (self->priv->request,
>-          TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET);
>+          TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET);
>     }
>   else
>     {
>       g_hash_table_insert (self->priv->request,
>-          g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET),
>+          g_strdup (TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET),
>           tp_g_value_slice_new_uint64 (offset));
>     }
> }
>diff --git a/telepathy-glib/account-request.c b/telepathy-glib/account-request.c
>index d0f176f..4f23097 100644
>--- a/telepathy-glib/account-request.c
>+++ b/telepathy-glib/account-request.c
>@@ -276,7 +276,7 @@ tp_account_request_get_property (GObject *object,
>     case PROP_AVATAR:
>       {
>         GValueArray *array = tp_asv_get_boxed (self->priv->properties,
>-            TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR,
>+            TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR,
>             TP_STRUCT_TYPE_AVATAR);
> 
>         if (array != NULL)
>@@ -286,7 +286,7 @@ tp_account_request_get_property (GObject *object,
>     case PROP_AVATAR_MIME_TYPE:
>       {
>         GValueArray *array = tp_asv_get_boxed (self->priv->properties,
>-            TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR,
>+            TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR,
>             TP_STRUCT_TYPE_AVATAR);
> 
>         if (array != NULL)
>@@ -299,7 +299,7 @@ tp_account_request_get_property (GObject *object,
>       break;
>     case PROP_STORAGE_PROVIDER:
>       g_value_set_string (value, tp_asv_get_string (self->priv->properties,
>-            TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER));
>+            TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_PROVIDER));
>       break;
>     default:
>       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
>@@ -1101,7 +1101,7 @@ tp_account_request_set_avatar (TpAccountRequest *self,
>   g_array_unref (tmp);
> 
>   tp_asv_take_boxed (priv->properties,
>-      TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR,
>+      TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR,
>       TP_STRUCT_TYPE_AVATAR, arr);
> }
> 
>@@ -1155,7 +1155,7 @@ tp_account_request_set_storage_provider (TpAccountRequest *self,
>   g_return_if_fail (priv->result == NULL && !priv->created);
> 
>   tp_asv_set_string (priv->properties,
>-      TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER, provider);
>+      TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_PROVIDER, provider);
> }
> 
> /**
>diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
>index ff2f9f2..e878b59 100644
>--- a/telepathy-glib/account.c
>+++ b/telepathy-glib/account.c
>@@ -614,7 +614,7 @@ tp_account_prepare_storage_async (TpProxy *proxy,
>   g_assert (self->priv->storage_provider == NULL);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_ACCOUNT_INTERFACE_STORAGE,
>+      TP_IFACE_ACCOUNT_INTERFACE_STORAGE1,
>       _tp_account_got_all_storage_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -1068,7 +1068,7 @@ dbus_properties_changed_cb (TpProxy *proxy,
> {
>   TpAccount *self = TP_ACCOUNT (weak_object);
> 
>-  if (!tp_strdiff (interface_name, TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING))
>+  if (!tp_strdiff (interface_name, TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1))
>     {
>       addressing_props_changed (self, changed_properties);
>     }
>@@ -3493,7 +3493,7 @@ tp_account_get_avatar_async (TpAccount *account,
>       callback, user_data, tp_account_get_avatar_finish);
> 
>   tp_cli_dbus_properties_call_get (account, -1,
>-      TP_IFACE_ACCOUNT_INTERFACE_AVATAR, "Avatar", _tp_account_got_avatar_cb,
>+      TP_IFACE_ACCOUNT_INTERFACE_AVATAR1, "Avatar", _tp_account_got_avatar_cb,
>       result, NULL, G_OBJECT (account));
> }
> 
>@@ -3695,7 +3695,7 @@ tp_account_set_avatar_async (TpAccount *self,
>   g_value_take_boxed (&value, arr);
> 
>   tp_cli_dbus_properties_call_set (self, -1,
>-      TP_IFACE_ACCOUNT_INTERFACE_AVATAR, "Avatar", &value,
>+      TP_IFACE_ACCOUNT_INTERFACE_AVATAR1, "Avatar", &value,
>       _tp_account_property_set_cb, result, NULL, NULL);
> 
>   g_value_unset (&value);
>@@ -3917,7 +3917,7 @@ tp_account_get_storage_specific_information_async (TpAccount *self,
>       callback, user_data, tp_account_get_storage_specific_information_async);
> 
>   tp_cli_dbus_properties_call_get (self, -1,
>-      TP_IFACE_ACCOUNT_INTERFACE_STORAGE, "StorageSpecificInformation",
>+      TP_IFACE_ACCOUNT_INTERFACE_STORAGE1, "StorageSpecificInformation",
>       _tp_account_get_storage_specific_information_cb, result, NULL, NULL);
> }
> 
>@@ -4091,7 +4091,7 @@ tp_account_prepare_addressing_async (TpProxy *proxy,
>   g_assert (self->priv->uri_schemes == NULL);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING,
>+      TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1,
>       _tp_account_got_all_addressing_cb, result, g_object_unref, NULL);
> }
> 
>@@ -4170,7 +4170,7 @@ tp_account_set_uri_scheme_association_async (TpAccount *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_account_set_uri_scheme_association_async);
> 
>-  tp_cli_account_interface_addressing_call_set_uri_scheme_association (
>+  tp_cli_account_interface_addressing1_call_set_uri_scheme_association (
>       self, -1, scheme, associate,
>       _tp_account_void_cb, result, NULL, NULL);
> }
>diff --git a/telepathy-glib/automatic-client-factory.c b/telepathy-glib/automatic-client-factory.c
>index 84ef614..f1f7eac 100644
>--- a/telepathy-glib/automatic-client-factory.c
>+++ b/telepathy-glib/automatic-client-factory.c
>@@ -145,13 +145,13 @@ static void
> build_channel_type_mapping (void)
> {
>   ChannelTypeMapping i_hate_c[] = {
>-      { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+      { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_TYPE_STREAM_TUBE_CHANNEL,
>         NULL,
>         (NewFunc) _tp_stream_tube_channel_new_with_factory,
>         { 0 },
>       },
>-      { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
>+      { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
>         TP_TYPE_DBUS_TUBE_CHANNEL,
>         NULL,
>         (NewFunc) _tp_dbus_tube_channel_new_with_factory,
>@@ -164,14 +164,14 @@ build_channel_type_mapping (void)
>         (NewFunc) _tp_text_channel_new_with_factory,
>         { 0 },
>       },
>-      { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+      { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>         TP_TYPE_FILE_TRANSFER_CHANNEL,
>         NULL,
>         (NewFunc) _tp_file_transfer_channel_new_with_factory,
>         { TP_FILE_TRANSFER_CHANNEL_FEATURE_CORE,
>           0 },
>       },
>-      { TP_IFACE_CHANNEL_TYPE_CALL,
>+      { TP_IFACE_CHANNEL_TYPE_CALL1,
>         TP_TYPE_CALL_CHANNEL,
>         NULL,
>         (NewFunc) _tp_call_channel_new_with_factory,
>diff --git a/telepathy-glib/base-call-channel.c b/telepathy-glib/base-call-channel.c
>index b9d053c..19464a8 100644
>--- a/telepathy-glib/base-call-channel.c
>+++ b/telepathy-glib/base-call-channel.c
>@@ -22,10 +22,10 @@
> /**
>  * SECTION:base-call-channel
>  * @title: TpBaseCallChannel
>- * @short_description: base class for #TpSvcChannelTypeCall implementations
>- * @see_also: #TpSvcChannelTypeCall, #TpBaseCallContent and #TpBaseCallStream
>+ * @short_description: base class for #TpSvcChannelTypeCall1 implementations
>+ * @see_also: #TpSvcChannelTypeCall1, #TpBaseCallContent and #TpBaseCallStream
>  *
>- * This base class makes it easier to write #TpSvcChannelTypeCall
>+ * This base class makes it easier to write #TpSvcChannelTypeCall1
>  * implementations by implementing its properties, and some of its methods.
>  *
>  * Subclasses should fill in #TpBaseCallChannelClass.accept,
>@@ -126,9 +126,9 @@ static void dtmf_iface_init (gpointer, gpointer);
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseCallChannel, tp_base_call_channel,
>   TP_TYPE_BASE_CHANNEL,
> 
>-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CALL,
>+  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CALL1,
>         call_iface_init)
>-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF,
>+  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1,
>         dtmf_iface_init)
>   )
> 
>@@ -435,14 +435,14 @@ tp_base_call_channel_fill_immutable_properties (
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_CALL, "InitialTransport",
>-      TP_IFACE_CHANNEL_TYPE_CALL, "InitialAudio",
>-      TP_IFACE_CHANNEL_TYPE_CALL, "InitialVideo",
>-      TP_IFACE_CHANNEL_TYPE_CALL, "InitialAudioName",
>-      TP_IFACE_CHANNEL_TYPE_CALL, "InitialVideoName",
>-      TP_IFACE_CHANNEL_TYPE_CALL, "MutableContents",
>-      TP_IFACE_CHANNEL_TYPE_CALL, "HardwareStreaming",
>-      TP_IFACE_CHANNEL_INTERFACE_DTMF, "InitialTones",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "InitialTransport",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "InitialAudio",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "InitialVideo",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "InitialAudioName",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "InitialVideoName",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "MutableContents",
>+      TP_IFACE_CHANNEL_TYPE_CALL1, "HardwareStreaming",
>+      TP_IFACE_CHANNEL_INTERFACE_DTMF1, "InitialTones",
>       NULL);
> }
> 
>@@ -484,7 +484,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
>   object_class->dispose = tp_base_call_channel_dispose;
>   object_class->finalize = tp_base_call_channel_finalize;
> 
>-  base_channel_class->channel_type = TP_IFACE_CHANNEL_TYPE_CALL;
>+  base_channel_class->channel_type = TP_IFACE_CHANNEL_TYPE_CALL1;
>   base_channel_class->fill_immutable_properties =
>       tp_base_call_channel_fill_immutable_properties;
>   base_channel_class->close = tp_base_call_channel_close;
>@@ -710,13 +710,13 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
>       param_spec);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_CALL,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_CALL1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       call_props);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       dtmf_props);
>@@ -767,7 +767,7 @@ tp_base_call_channel_flags_changed (TpBaseCallChannel *self,
> 
>   if (tp_base_channel_is_registered (TP_BASE_CHANNEL (self)))
>     {
>-      tp_svc_channel_type_call_emit_call_state_changed (self,
>+      tp_svc_channel_type_call1_emit_call_state_changed (self,
>           self->priv->state, self->priv->flags, self->priv->reason,
>           self->priv->details);
>     }
>@@ -822,7 +822,7 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
> 
>   if (tp_base_channel_is_registered (TP_BASE_CHANNEL (self)))
>     {
>-      tp_svc_channel_type_call_emit_call_state_changed (self, self->priv->state,
>+      tp_svc_channel_type_call1_emit_call_state_changed (self, self->priv->state,
>           self->priv->flags, self->priv->reason, self->priv->details);
>     }
> 
>@@ -837,7 +837,7 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
>       self->priv->state = TP_CALL_STATE_INITIALISED;
>       if (tp_base_channel_is_registered (TP_BASE_CHANNEL (self)))
>         {
>-          tp_svc_channel_type_call_emit_call_state_changed (self,
>+          tp_svc_channel_type_call1_emit_call_state_changed (self,
>               self->priv->state, self->priv->flags, self->priv->reason,
>               self->priv->details);
>         }
>@@ -854,7 +854,7 @@ tp_base_call_channel_set_state (TpBaseCallChannel *self,
>       self->priv->state = TP_CALL_STATE_ACTIVE;
>       if (tp_base_channel_is_registered (TP_BASE_CHANNEL (self)))
>         {
>-          tp_svc_channel_type_call_emit_call_state_changed (self,
>+          tp_svc_channel_type_call1_emit_call_state_changed (self,
>               self->priv->state, self->priv->flags, self->priv->reason,
>               self->priv->details);
>         }
>@@ -979,7 +979,7 @@ _tp_base_call_channel_remove_content_internal (TpBaseCallChannel *self,
> 
>   path = tp_base_call_content_get_object_path (
>       TP_BASE_CALL_CONTENT (content));
>-  tp_svc_channel_type_call_emit_content_removed (self, path, reason_array);
>+  tp_svc_channel_type_call1_emit_content_removed (self, path, reason_array);
> 
>   _tp_base_call_content_deinit (TP_BASE_CALL_CONTENT (content));
>   g_object_unref (content);
>@@ -1081,7 +1081,7 @@ tp_base_call_channel_add_content (TpBaseCallChannel *self,
>         }
>     }
> 
>-  tp_svc_channel_type_call_emit_content_added (self,
>+  tp_svc_channel_type_call1_emit_content_added (self,
>      tp_base_call_content_get_object_path (content));
> }
> 
>@@ -1145,7 +1145,7 @@ tp_base_call_channel_update_member_flags (TpBaseCallChannel *self,
>   reason_array = _tp_base_call_state_reason_new (actor_handle, reason,
>       dbus_reason, message);
> 
>-  tp_svc_channel_type_call_emit_call_members_changed (self,
>+  tp_svc_channel_type_call1_emit_call_members_changed (self,
>       updates, identifiers, empty_array, reason_array);
> 
>   g_hash_table_unref (updates);
>@@ -1198,7 +1198,7 @@ tp_base_call_channel_remove_member (TpBaseCallChannel *self,
>   removed = g_array_new (FALSE, FALSE, sizeof (TpHandle));
>   g_array_append_val (removed, contact);
> 
>-  tp_svc_channel_type_call_emit_call_members_changed (self,
>+  tp_svc_channel_type_call1_emit_call_members_changed (self,
>       empty_table, empty_table, removed, reason_array);
> 
>   g_hash_table_unref (empty_table);
>@@ -1279,7 +1279,7 @@ tp_base_call_channel_is_accepted (TpBaseCallChannel *self)
> /* DBus method implementation */
> 
> static void
>-tp_base_call_channel_set_ringing (TpSvcChannelTypeCall *iface,
>+tp_base_call_channel_set_ringing (TpSvcChannelTypeCall1 *iface,
>     DBusGMethodInvocation *context)
> {
>   TpBaseCallChannel *self = TP_BASE_CALL_CHANNEL (iface);
>@@ -1315,12 +1315,12 @@ tp_base_call_channel_set_ringing (TpSvcChannelTypeCall *iface,
>               "Local client has started ringing");
>         }
> 
>-      tp_svc_channel_type_call_return_from_set_ringing (context);
>+      tp_svc_channel_type_call1_return_from_set_ringing (context);
>     }
> }
> 
> static void
>-tp_base_call_channel_set_queued (TpSvcChannelTypeCall *iface,
>+tp_base_call_channel_set_queued (TpSvcChannelTypeCall1 *iface,
>     DBusGMethodInvocation *context)
> {
>   TpBaseCallChannel *self = TP_BASE_CALL_CHANNEL (iface);
>@@ -1356,7 +1356,7 @@ tp_base_call_channel_set_queued (TpSvcChannelTypeCall *iface,
>               "Local client has queued the call");
>         }
> 
>-      tp_svc_channel_type_call_return_from_set_queued (context);
>+      tp_svc_channel_type_call1_return_from_set_queued (context);
>     }
> }
> 
>@@ -1377,7 +1377,7 @@ raise_accept_state_error (TpBaseCallChannel *self,
> }
> 
> static void
>-tp_base_call_channel_accept (TpSvcChannelTypeCall *iface,
>+tp_base_call_channel_accept (TpSvcChannelTypeCall1 *iface,
>     DBusGMethodInvocation *context)
> {
>   TpBaseCallChannel *self = TP_BASE_CALL_CHANNEL (iface);
>@@ -1426,7 +1426,7 @@ tp_base_call_channel_accept (TpSvcChannelTypeCall *iface,
> 
>   klass->accept (self);
> 
>-  tp_svc_channel_type_call_return_from_accept (context);
>+  tp_svc_channel_type_call1_return_from_accept (context);
> }
> 
> static void
>@@ -1437,7 +1437,7 @@ tp_base_call_channel_accept_real (TpBaseCallChannel *self)
> }
> 
> static void
>-tp_base_call_channel_hangup (TpSvcChannelTypeCall *iface,
>+tp_base_call_channel_hangup (TpSvcChannelTypeCall1 *iface,
>   guint reason,
>   const gchar *detailed_reason,
>   const gchar *message,
>@@ -1462,11 +1462,11 @@ tp_base_call_channel_hangup (TpSvcChannelTypeCall *iface,
>       tp_base_channel_get_self_handle (tp_base),
>       reason, detailed_reason, message);
> 
>-  tp_svc_channel_type_call_return_from_hangup (context);
>+  tp_svc_channel_type_call1_return_from_hangup (context);
> }
> 
> static void
>-tp_base_call_channel_add_content_dbus (TpSvcChannelTypeCall *iface,
>+tp_base_call_channel_add_content_dbus (TpSvcChannelTypeCall1 *iface,
>   const gchar *name,
>   TpMediaStreamType mtype,
>   TpMediaStreamDirection initial_direction,
>@@ -1516,7 +1516,7 @@ tp_base_call_channel_add_content_dbus (TpSvcChannelTypeCall *iface,
>           "should have called tp_base_call_channel_add_content()");
>     }
> 
>-  tp_svc_channel_type_call_return_from_add_content (context,
>+  tp_svc_channel_type_call1_return_from_add_content (context,
>       tp_base_call_content_get_object_path (content));
>   return;
> 
>@@ -1528,10 +1528,10 @@ error:
> static void
> call_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcChannelTypeCallClass *klass =
>-    (TpSvcChannelTypeCallClass *) g_iface;
>+  TpSvcChannelTypeCall1Class *klass =
>+    (TpSvcChannelTypeCall1Class *) g_iface;
> 
>-#define IMPLEMENT(x, suffix) tp_svc_channel_type_call_implement_##x (\
>+#define IMPLEMENT(x, suffix) tp_svc_channel_type_call1_implement_##x (\
>     klass, tp_base_call_channel_##x##suffix)
>   IMPLEMENT(set_ringing,);
>   IMPLEMENT(set_queued,);
>diff --git a/telepathy-glib/base-call-content.c b/telepathy-glib/base-call-content.c
>index 89e263b..68b7c37 100644
>--- a/telepathy-glib/base-call-content.c
>+++ b/telepathy-glib/base-call-content.c
>@@ -23,10 +23,10 @@
> /**
>  * SECTION:base-call-content
>  * @title: TpBaseCallContent
>- * @short_description: base class for #TpSvcCallContent implementations
>- * @see_also: #TpSvcCallContent, #TpBaseCallChannel and #TpBaseCallStream
>+ * @short_description: base class for #TpSvcCall1Content implementations
>+ * @see_also: #TpSvcCall1Content, #TpBaseCallChannel and #TpBaseCallStream
>  *
>- * This base class makes it easier to write #TpSvcCallContent
>+ * This base class makes it easier to write #TpSvcCall1Content
>  * implementations by implementing its properties, and some of its methods.
>  *
>  * Subclasses should fill in #TpBaseCallContentClass.get_interfaces,
>@@ -150,9 +150,9 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseCallContent, tp_base_call_content,
> 
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>         tp_dbus_properties_mixin_iface_init)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT,
>         call_content_iface_init)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_INTERFACE_DTMF,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_DTMF1,
>         call_content_dtmf_iface_init)
>     )
> 
>@@ -384,12 +384,12 @@ tp_base_call_content_class_init (TpBaseCallContentClass *klass)
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_CALL_CONTENT,
>+      { TP_IFACE_CALL1_CONTENT,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         content_props,
>       },
>-      { TP_IFACE_CALL_CONTENT_INTERFACE_DTMF,
>+      { TP_IFACE_CALL1_CONTENT_INTERFACE_DTMF1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         content_dtmf_props,
>@@ -686,7 +686,7 @@ tp_base_call_content_add_stream (TpBaseCallContent *self,
>   g_ptr_array_add (paths, g_strdup (
>      tp_base_call_stream_get_object_path (
>          TP_BASE_CALL_STREAM (stream))));
>-  tp_svc_call_content_emit_streams_added (self, paths);
>+  tp_svc_call1_content_emit_streams_added (self, paths);
>   g_ptr_array_unref (paths);
> }
> 
>@@ -708,7 +708,7 @@ _tp_base_call_content_remove_stream_internal (TpBaseCallContent *self,
>   g_ptr_array_add (paths, (gpointer)
>       tp_base_call_stream_get_object_path (stream));
> 
>-  tp_svc_call_content_emit_streams_removed (self, paths, reason_array);
>+  tp_svc_call1_content_emit_streams_removed (self, paths, reason_array);
> 
>   g_ptr_array_unref (paths);
>   g_object_unref (stream);
>@@ -755,7 +755,7 @@ tp_base_call_content_remove_stream (TpBaseCallContent *self,
> }
> 
> static void
>-tp_call_content_remove (TpSvcCallContent *content,
>+tp_call_content_remove (TpSvcCall1Content *content,
>     DBusGMethodInvocation *context)
> {
>   TpBaseCallContent *self = TP_BASE_CALL_CONTENT (content);
>@@ -773,16 +773,16 @@ tp_call_content_remove (TpSvcCallContent *content,
>       TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "",
>       "User has removed the content");
> 
>-  tp_svc_call_content_return_from_remove (context);
>+  tp_svc_call1_content_return_from_remove (context);
> }
> 
> static void
> call_content_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcCallContentClass *klass =
>-    (TpSvcCallContentClass *) g_iface;
>+  TpSvcCall1ContentClass *klass =
>+    (TpSvcCall1ContentClass *) g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_call_content_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_call1_content_implement_##x (\
>     klass, tp_call_content_##x)
>   IMPLEMENT(remove);
> #undef IMPLEMENT
>@@ -862,7 +862,7 @@ _tp_base_call_content_accepted (TpBaseCallContent *self,
> }
> 
> static void
>-tp_call_content_start_tone (TpSvcCallContentInterfaceDTMF *dtmf,
>+tp_call_content_start_tone (TpSvcCall1ContentInterfaceDTMF1 *dtmf,
>     guchar event,
>     DBusGMethodInvocation *context)
> {
>@@ -885,11 +885,11 @@ tp_call_content_start_tone (TpSvcCallContentInterfaceDTMF *dtmf,
>       return;
>     }
> 
>-  tp_svc_call_content_interface_dtmf_return_from_start_tone (context);
>+  tp_svc_call1_content_interface_dtmf1_return_from_start_tone (context);
> }
> 
> static void
>-tp_call_content_stop_tone (TpSvcCallContentInterfaceDTMF *dtmf,
>+tp_call_content_stop_tone (TpSvcCall1ContentInterfaceDTMF1 *dtmf,
>    DBusGMethodInvocation *context)
> {
>   TpBaseCallContent *self = TP_BASE_CALL_CONTENT (dtmf);
>@@ -911,11 +911,11 @@ tp_call_content_stop_tone (TpSvcCallContentInterfaceDTMF *dtmf,
>       return;
>     }
> 
>-  tp_svc_call_content_interface_dtmf_return_from_stop_tone (context);
>+  tp_svc_call1_content_interface_dtmf1_return_from_stop_tone (context);
> }
> 
> static void
>-tp_call_content_multiple_tones (TpSvcCallContentInterfaceDTMF *dtmf,
>+tp_call_content_multiple_tones (TpSvcCall1ContentInterfaceDTMF1 *dtmf,
>     const gchar *tones,
>     DBusGMethodInvocation *context)
> {
>@@ -938,16 +938,16 @@ tp_call_content_multiple_tones (TpSvcCallContentInterfaceDTMF *dtmf,
>       return;
>     }
> 
>-  tp_svc_call_content_interface_dtmf_return_from_multiple_tones (context);
>+  tp_svc_call1_content_interface_dtmf1_return_from_multiple_tones (context);
> }
> 
> static void
> call_content_dtmf_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcCallContentInterfaceDTMFClass *klass =
>-      (TpSvcCallContentInterfaceDTMFClass *) g_iface;
>+  TpSvcCall1ContentInterfaceDTMF1Class *klass =
>+      (TpSvcCall1ContentInterfaceDTMF1Class *) g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_call_content_interface_dtmf_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_call1_content_interface_dtmf1_implement_##x (\
>     klass, tp_call_content_##x)
>   IMPLEMENT(start_tone);
>   IMPLEMENT(stop_tone);
>diff --git a/telepathy-glib/base-call-stream.c b/telepathy-glib/base-call-stream.c
>index 415e0ef..370a1c4 100644
>--- a/telepathy-glib/base-call-stream.c
>+++ b/telepathy-glib/base-call-stream.c
>@@ -23,10 +23,10 @@
> /**
>  * SECTION:base-call-stream
>  * @title: TpBaseCallStream
>- * @short_description: base class for #TpSvcCallStream implementations
>- * @see_also: #TpSvcCallStream, #TpBaseCallChannel and #TpBaseCallContent
>+ * @short_description: base class for #TpSvcCall1Stream implementations
>+ * @see_also: #TpSvcCall1Stream, #TpBaseCallChannel and #TpBaseCallContent
>  *
>- * This base class makes it easier to write #TpSvcCallStream
>+ * This base class makes it easier to write #TpSvcCall1Stream
>  * implementations by implementing its properties, and some of its methods.
>  *
>  * Subclasses should fill in #TpBaseCallStreamClass.get_interfaces,
>@@ -118,7 +118,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseCallStream, tp_base_call_stream,
> 
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>         tp_dbus_properties_mixin_iface_init)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_STREAM, call_stream_iface_init)
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_STREAM, call_stream_iface_init)
>     )
> 
> enum
>@@ -319,7 +319,7 @@ tp_base_call_stream_class_init (TpBaseCallStreamClass *klass)
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_CALL_STREAM,
>+      { TP_IFACE_CALL1_STREAM,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         stream_props,
>@@ -570,8 +570,8 @@ tp_base_call_stream_update_local_sending_state (TpBaseCallStream *self,
>   reason_array = _tp_base_call_state_reason_new (actor_handle, reason,
>       dbus_reason, message);
> 
>-  tp_svc_call_stream_emit_local_sending_state_changed (
>-      TP_SVC_CALL_STREAM (self), new_state, reason_array);
>+  tp_svc_call1_stream_emit_local_sending_state_changed (
>+      TP_SVC_CALL1_STREAM (self), new_state, reason_array);
> 
>   tp_value_array_free (reason_array);
> 
>@@ -673,7 +673,7 @@ tp_base_call_stream_update_remote_sending_state (TpBaseCallStream *self,
>   reason_array = _tp_base_call_state_reason_new (actor_handle, reason,
>       dbus_reason, message);
> 
>-  tp_svc_call_stream_emit_remote_members_changed (self, updates, identifiers,
>+  tp_svc_call1_stream_emit_remote_members_changed (self, updates, identifiers,
>       removed_empty, reason_array);
> 
>   g_array_unref (removed_empty);
>@@ -729,7 +729,7 @@ tp_base_call_stream_remove_member (TpBaseCallStream *self,
>   reason_array = _tp_base_call_state_reason_new (actor_handle, reason,
>       dbus_reason, message);
> 
>-  tp_svc_call_stream_emit_remote_members_changed (self, empty_table,
>+  tp_svc_call1_stream_emit_remote_members_changed (self, empty_table,
>       empty_table, removed_array, reason_array);
> 
>   tp_value_array_free (reason_array);
>@@ -740,7 +740,7 @@ tp_base_call_stream_remove_member (TpBaseCallStream *self,
> }
> 
> static void
>-tp_base_call_stream_set_sending_dbus (TpSvcCallStream *iface,
>+tp_base_call_stream_set_sending_dbus (TpSvcCall1Stream *iface,
>     gboolean sending,
>     DBusGMethodInvocation *context)
> {
>@@ -752,7 +752,7 @@ tp_base_call_stream_set_sending_dbus (TpSvcCallStream *iface,
>           TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED, "",
>           "User changed the sending state", &error))
>     {
>-      tp_svc_call_stream_return_from_set_sending (context);
>+      tp_svc_call1_stream_return_from_set_sending (context);
>     }
>   else
>     {
>@@ -763,7 +763,7 @@ tp_base_call_stream_set_sending_dbus (TpSvcCallStream *iface,
> }
> 
> static void
>-tp_base_call_stream_request_receiving (TpSvcCallStream *iface,
>+tp_base_call_stream_request_receiving (TpSvcCall1Stream *iface,
>     TpHandle contact,
>     gboolean receiving,
>     DBusGMethodInvocation *context)
>@@ -821,7 +821,7 @@ tp_base_call_stream_request_receiving (TpSvcCallStream *iface,
>     goto error;
> 
> out:
>-  tp_svc_call_stream_return_from_request_receiving (context);
>+  tp_svc_call1_stream_return_from_request_receiving (context);
>   return;
> 
> error:
>@@ -832,10 +832,10 @@ error:
> static void
> call_stream_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcCallStreamClass *klass =
>-    (TpSvcCallStreamClass *) g_iface;
>+  TpSvcCall1StreamClass *klass =
>+    (TpSvcCall1StreamClass *) g_iface;
> 
>-#define IMPLEMENT(x, suffix) tp_svc_call_stream_implement_##x (\
>+#define IMPLEMENT(x, suffix) tp_svc_call1_stream_implement_##x (\
>     klass, tp_base_call_stream_##x##suffix)
>   IMPLEMENT(set_sending, _dbus);
>   IMPLEMENT(request_receiving,);
>diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
>index b0920af..d803ac5 100644
>--- a/telepathy-glib/base-contact-list.c
>+++ b/telepathy-glib/base-contact-list.c
>@@ -52,13 +52,13 @@
>  * <itemizedlist>
>  *  <listitem>
>  *   <para>in #G_DEFINE_TYPE_WITH_CODE, implement
>- *   #TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST using
>+ *   #TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1 using
>  *   tp_base_contact_list_mixin_list_iface_init():</para>
>  * |[
>  * G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
>  *     TP_TYPE_BASE_CONNECTION,
>  *     // ...
>- *     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
>+ *     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1,
>  *         tp_base_contact_list_mixin_list_iface_init);
>  *     // ...
>  *     )
>@@ -75,7 +75,7 @@
>  * tp_base_contact_list_mixin_class_init (base_connection_class);
>  * // ...
>  * ]|
>- *   <para>and include %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST in
>+ *   <para>and include %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1 in
>  *    the output of
>  *    #TpBaseConnectionClass.get_interfaces_always_present;</para>
>  *  </listitem>
>@@ -88,9 +88,9 @@
>  *
>  * To support user-defined contact groups too, additionally implement
>  * %TP_TYPE_CONTACT_GROUP_LIST in the #TpBaseContactList subclass, add the
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS interface to the output of
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1 interface to the output of
>  * #TpBaseConnectionClass.get interfaces_always_present, and implement the
>- * %TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS in the #TpBaseConnection
>+ * %TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1 in the #TpBaseConnection
>  * subclass using tp_base_contact_list_mixin_groups_iface_init().
>  *
>  * Optionally, one or more of the #TP_TYPE_MUTABLE_CONTACT_LIST,
>@@ -646,11 +646,11 @@ tp_base_contact_list_constructed (GObject *object)
>   g_return_if_fail (cls->download_async != NULL);
> 
>   self->priv->svc_contact_list =
>-    TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_LIST (self->priv->conn);
>+    TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_LIST1 (self->priv->conn);
>   self->priv->svc_contact_groups =
>-    TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS (self->priv->conn);
>+    TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1 (self->priv->conn);
>   self->priv->svc_contact_blocking =
>-    TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING (self->priv->conn);
>+    TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1 (self->priv->conn);
> 
>   if (TP_IS_MUTABLE_CONTACT_LIST (self))
>     {
>@@ -866,7 +866,7 @@ tp_base_contact_list_set_list_pending (TpBaseContactList *self)
>     return;
> 
>   self->priv->state = TP_CONTACT_LIST_STATE_WAITING;
>-  tp_svc_connection_interface_contact_list_emit_contact_list_state_changed (
>+  tp_svc_connection_interface_contact_list1_emit_contact_list_state_changed (
>       self->priv->conn, self->priv->state);
> }
> 
>@@ -899,7 +899,7 @@ tp_base_contact_list_set_list_failed (TpBaseContactList *self,
>   self->priv->state = TP_CONTACT_LIST_STATE_FAILURE;
>   g_clear_error (&self->priv->failure);
>   self->priv->failure = g_error_new_literal (domain, code, message);
>-  tp_svc_connection_interface_contact_list_emit_contact_list_state_changed (
>+  tp_svc_connection_interface_contact_list1_emit_contact_list_state_changed (
>       self->priv->conn, self->priv->state);
> 
>   tp_base_contact_list_fail_blocked_contact_requests (self,
>@@ -987,7 +987,7 @@ tp_base_contact_list_set_list_received (TpBaseContactList *self)
> 
>           while ((context = g_queue_pop_head (
>                       &self->priv->blocked_contact_requests)) != NULL)
>-            tp_svc_connection_interface_contact_blocking_return_from_request_blocked_contacts (context, map);
>+            tp_svc_connection_interface_contact_blocking1_return_from_request_blocked_contacts (context, map);
> 
>           g_hash_table_unref (map);
>         }
>@@ -1023,7 +1023,7 @@ tp_base_contact_list_set_list_received (TpBaseContactList *self)
> 
>   /* emit this last, so people can distinguish between the initial state
>    * and subsequent changes */
>-  tp_svc_connection_interface_contact_list_emit_contact_list_state_changed (
>+  tp_svc_connection_interface_contact_list1_emit_contact_list_state_changed (
>       self->priv->conn, self->priv->state);
> }
> 
>@@ -1160,7 +1160,7 @@ tp_base_contact_list_contacts_changed_internal (TpBaseContactList *self,
> 
>       if (self->priv->svc_contact_list)
>         {
>-          tp_svc_connection_interface_contact_list_emit_contacts_changed (
>+          tp_svc_connection_interface_contact_list1_emit_contacts_changed (
>               self->priv->conn, changes, change_ids, removal_ids);
>         }
>     }
>@@ -1292,7 +1292,7 @@ tp_base_contact_list_contact_blocking_changed (TpBaseContactList *self,
>   if (self->priv->svc_contact_blocking &&
>       (g_hash_table_size (blocked_contacts) > 0 ||
>        g_hash_table_size (unblocked_contacts) > 0))
>-    tp_svc_connection_interface_contact_blocking_emit_blocked_contacts_changed (
>+    tp_svc_connection_interface_contact_blocking1_emit_blocked_contacts_changed (
>         self->priv->conn, blocked_contacts, unblocked_contacts);
> 
>   g_hash_table_unref (blocked_contacts);
>@@ -2532,7 +2532,7 @@ tp_base_contact_list_groups_created (TpBaseContactList *self,
>       if (self->priv->svc_contact_groups)
>       {
>         g_ptr_array_add (actually_created, NULL);
>-        tp_svc_connection_interface_contact_groups_emit_groups_created (
>+        tp_svc_connection_interface_contact_groups1_emit_groups_created (
>             self->priv->conn, (const gchar **) actually_created->pdata);
>       }
>     }
>@@ -2632,7 +2632,7 @@ tp_base_contact_list_groups_removed (TpBaseContactList *self,
>       g_ptr_array_add (actually_removed, NULL);
> 
>       if (self->priv->svc_contact_groups)
>-        tp_svc_connection_interface_contact_groups_emit_groups_removed (
>+        tp_svc_connection_interface_contact_groups1_emit_groups_removed (
>             self->priv->conn, (const gchar **) actually_removed->pdata);
> 
>       if (members_arr->len > 0)
>@@ -2643,7 +2643,7 @@ tp_base_contact_list_groups_removed (TpBaseContactList *self,
>               members_arr->len, actually_removed->len - 1);
> 
>           if (self->priv->svc_contact_groups)
>-            tp_svc_connection_interface_contact_groups_emit_groups_changed (
>+            tp_svc_connection_interface_contact_groups1_emit_groups_changed (
>                 self->priv->conn, members_arr, NULL,
>                 (const gchar **) actually_removed->pdata);
>         }
>@@ -2693,13 +2693,13 @@ tp_base_contact_list_group_renamed (TpBaseContactList *self,
> 
>   if (self->priv->svc_contact_groups)
>     {
>-      tp_svc_connection_interface_contact_groups_emit_group_renamed (
>+      tp_svc_connection_interface_contact_groups1_emit_group_renamed (
>           self->priv->conn, old_names[0], new_names[0]);
> 
>-      tp_svc_connection_interface_contact_groups_emit_groups_created (
>+      tp_svc_connection_interface_contact_groups1_emit_groups_created (
>           self->priv->conn, new_names);
> 
>-      tp_svc_connection_interface_contact_groups_emit_groups_removed (
>+      tp_svc_connection_interface_contact_groups1_emit_groups_removed (
>           self->priv->conn, old_names);
>     }
> 
>@@ -2715,7 +2715,7 @@ tp_base_contact_list_group_renamed (TpBaseContactList *self,
>         {
>           GArray *arr = tp_intset_to_array (set);
> 
>-          tp_svc_connection_interface_contact_groups_emit_groups_changed (
>+          tp_svc_connection_interface_contact_groups1_emit_groups_changed (
>               self->priv->conn, arr, new_names, old_names);
>           g_array_unref (arr);
>         }
>@@ -2913,7 +2913,7 @@ tp_base_contact_list_groups_changed (TpBaseContactList *self,
>         {
>           GArray *members_arr = tp_handle_set_to_array (contacts);
> 
>-          tp_svc_connection_interface_contact_groups_emit_groups_changed (
>+          tp_svc_connection_interface_contact_groups1_emit_groups_changed (
>               self->priv->conn, members_arr,
>               (const gchar **) really_added->pdata,
>               (const gchar **) really_removed->pdata);
>@@ -3572,7 +3572,7 @@ tp_base_contact_list_remove_group_finish (TpBaseContactList *self,
> 
> static void
> tp_base_contact_list_mixin_get_contact_list_attributes (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     const gchar **interfaces,
>     DBusGMethodInvocation *context)
> {
>@@ -3595,14 +3595,14 @@ tp_base_contact_list_mixin_get_contact_list_attributes (
>       TpHandleSet *set;
>       GArray *contacts;
>       const gchar *assumed[] = { TP_IFACE_CONNECTION,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST, NULL };
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1, NULL };
>       GHashTable *result;
> 
>       set = tp_base_contact_list_dup_contacts (self);
>       contacts = tp_handle_set_to_array (set);
>       result = tp_contacts_mixin_get_contact_attributes (
>           (GObject *) self->priv->conn, contacts, interfaces, assumed);
>-      tp_svc_connection_interface_contact_list_return_from_get_contact_list_attributes (
>+      tp_svc_connection_interface_contact_list1_return_from_get_contact_list_attributes (
>           context, result);
> 
>       g_array_unref (contacts);
>@@ -3868,7 +3868,7 @@ tp_base_contact_list_mixin_request_subscription_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_request_subscription (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     const GArray *contacts,
>     const gchar *message,
>     DBusGMethodInvocation *context)
>@@ -3908,7 +3908,7 @@ tp_base_contact_list_mixin_authorize_publication_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_authorize_publication (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
> {
>@@ -3947,7 +3947,7 @@ tp_base_contact_list_mixin_remove_contacts_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_remove_contacts (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
> {
>@@ -3986,7 +3986,7 @@ tp_base_contact_list_mixin_unsubscribe_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_unsubscribe (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
> {
>@@ -4025,7 +4025,7 @@ tp_base_contact_list_mixin_unpublish_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_unpublish (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
> {
>@@ -4143,11 +4143,11 @@ tp_base_contact_list_fill_list_contact_attributes (GObject *obj,
>           &subscribe, &publish, &publish_request);
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH,
>+          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH,
>           tp_g_value_slice_new_uint (publish));
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE,
>+          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_SUBSCRIBE,
>           tp_g_value_slice_new_uint (subscribe));
> 
>       if (tp_str_empty (publish_request) ||
>@@ -4158,7 +4158,7 @@ tp_base_contact_list_fill_list_contact_attributes (GObject *obj,
>       else
>         {
>           tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-              handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST,
>+              handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH_REQUEST,
>               tp_g_value_slice_new_take_string (publish_request));
>         }
>     }
>@@ -4179,7 +4179,7 @@ tp_base_contact_list_mixin_download_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_download (
>-    TpSvcConnectionInterfaceContactList *svc,
>+    TpSvcConnectionInterfaceContactList1 *svc,
>     DBusGMethodInvocation *context)
> {
>   TpBaseContactList *self = g_object_get_qdata ((GObject *) svc,
>@@ -4192,20 +4192,20 @@ tp_base_contact_list_mixin_download (
> /**
>  * tp_base_contact_list_mixin_list_iface_init:
>  * @klass: the service-side D-Bus interface,
>- *  a #TpSvcConnectionInterfaceContactListClass
>+ *  a #TpSvcConnectionInterfaceContactList1Class
>  *
>  * Use the #TpBaseContactList like a mixin, to implement the ContactList
>  * D-Bus interface.
>  *
>  * This function should be passed to G_IMPLEMENT_INTERFACE() for
>- * #TpSvcConnectionInterfaceContactList.
>+ * #TpSvcConnectionInterfaceContactList1.
>  *
>  * Since: 0.13.0
>  */
> void
> tp_base_contact_list_mixin_list_iface_init (gpointer klass)
> {
>-#define IMPLEMENT(x) tp_svc_connection_interface_contact_list_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_contact_list1_implement_##x (\
>   klass, tp_base_contact_list_mixin_##x)
>   IMPLEMENT (get_contact_list_attributes);
>   IMPLEMENT (request_subscription);
>@@ -4288,7 +4288,7 @@ tp_base_contact_list_mixin_set_contact_groups_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_set_contact_groups (
>-    TpSvcConnectionInterfaceContactGroups *svc,
>+    TpSvcConnectionInterfaceContactGroups1 *svc,
>     guint contact,
>     const gchar **groups,
>     DBusGMethodInvocation *context)
>@@ -4352,7 +4352,7 @@ tp_base_contact_list_mixin_set_group_members_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_set_group_members (
>-    TpSvcConnectionInterfaceContactGroups *svc,
>+    TpSvcConnectionInterfaceContactGroups1 *svc,
>     const gchar *group,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
>@@ -4393,7 +4393,7 @@ tp_base_contact_list_mixin_add_to_group_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_add_to_group (
>-    TpSvcConnectionInterfaceContactGroups *svc,
>+    TpSvcConnectionInterfaceContactGroups1 *svc,
>     const gchar *group,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
>@@ -4440,7 +4440,7 @@ tp_base_contact_list_mixin_remove_from_group_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_remove_from_group (
>-    TpSvcConnectionInterfaceContactGroups *svc,
>+    TpSvcConnectionInterfaceContactGroups1 *svc,
>     const gchar *group,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
>@@ -4490,7 +4490,7 @@ tp_base_contact_list_mixin_remove_group_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_remove_group (
>-    TpSvcConnectionInterfaceContactGroups *svc,
>+    TpSvcConnectionInterfaceContactGroups1 *svc,
>     const gchar *group,
>     DBusGMethodInvocation *context)
> {
>@@ -4535,7 +4535,7 @@ tp_base_contact_list_mixin_rename_group_cb (GObject *source,
> 
> static void
> tp_base_contact_list_mixin_rename_group (
>-    TpSvcConnectionInterfaceContactGroups *svc,
>+    TpSvcConnectionInterfaceContactGroups1 *svc,
>     const gchar *before,
>     const gchar *after,
>     DBusGMethodInvocation *context)
>@@ -4660,7 +4660,7 @@ tp_base_contact_list_fill_groups_contact_attributes (GObject *obj,
>       handle = g_array_index (contacts, TpHandle, i);
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS,
>+          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS,
>           tp_g_value_slice_new_take_boxed (G_TYPE_STRV,
>             tp_base_contact_list_dup_contact_groups (self, handle)));
>     }
>@@ -4695,7 +4695,7 @@ tp_base_contact_list_fill_blocking_contact_attributes (GObject *obj,
>       is_blocked = tp_handle_set_is_member (blocked, handle);
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED,
>+          handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING1_BLOCKED,
>           tp_g_value_slice_new_boolean (is_blocked));
>     }
> 
>@@ -4705,20 +4705,20 @@ tp_base_contact_list_fill_blocking_contact_attributes (GObject *obj,
> /**
>  * tp_base_contact_list_mixin_groups_iface_init:
>  * @klass: the service-side D-Bus interface,
>- *  a #TpSvcConnectionInterfaceContactGroupsClass
>+ *  a #TpSvcConnectionInterfaceContactGroups1Class
>  *
>  * Use the #TpBaseContactList like a mixin, to implement the ContactGroups
>  * D-Bus interface.
>  *
>  * This function should be passed to G_IMPLEMENT_INTERFACE() for
>- * #TpSvcConnectionInterfaceContactGroups.
>+ * #TpSvcConnectionInterfaceContactGroups1.
>  *
>  * Since: 0.13.0
>  */
> void
> tp_base_contact_list_mixin_groups_iface_init (gpointer klass)
> {
>-#define IMPLEMENT(x) tp_svc_connection_interface_contact_groups_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_contact_groups1_implement_##x (\
>   klass, tp_base_contact_list_mixin_##x)
>   IMPLEMENT (set_contact_groups);
>   IMPLEMENT (set_group_members);
>@@ -4740,7 +4740,7 @@ tp_base_contact_list_mixin_groups_iface_init (gpointer klass)
> 
> static void
> tp_base_contact_list_mixin_request_blocked_contacts (
>-    TpSvcConnectionInterfaceContactBlocking *svc,
>+    TpSvcConnectionInterfaceContactBlocking1 *svc,
>     DBusGMethodInvocation *context)
> {
>   TpBaseContactList *self = g_object_get_qdata ((GObject *) svc,
>@@ -4765,7 +4765,7 @@ tp_base_contact_list_mixin_request_blocked_contacts (
>         TpHandleSet *blocked = tp_base_contact_list_dup_blocked_contacts (self);
>         GHashTable *map = tp_handle_set_to_identifier_map (blocked);
> 
>-        tp_svc_connection_interface_contact_blocking_return_from_request_blocked_contacts (context, map);
>+        tp_svc_connection_interface_contact_blocking1_return_from_request_blocked_contacts (context, map);
> 
>         g_hash_table_unref (map);
>         tp_handle_set_destroy (blocked);
>@@ -4796,7 +4796,7 @@ blocked_cb (
>   if (tp_base_contact_list_block_contacts_with_abuse_finish (self, result,
>           &error))
>     {
>-      tp_svc_connection_interface_contact_blocking_return_from_block_contacts (
>+      tp_svc_connection_interface_contact_blocking1_return_from_block_contacts (
>           context);
>     }
>   else
>@@ -4808,7 +4808,7 @@ blocked_cb (
> 
> static void
> tp_base_contact_list_mixin_block_contacts (
>-    TpSvcConnectionInterfaceContactBlocking *svc,
>+    TpSvcConnectionInterfaceContactBlocking1 *svc,
>     const GArray *contacts_arr,
>     gboolean report_abusive,
>     DBusGMethodInvocation *context)
>@@ -4838,7 +4838,7 @@ unblocked_cb (
> 
>   if (tp_base_contact_list_unblock_contacts_finish (self, result, &error))
>     {
>-      tp_svc_connection_interface_contact_blocking_return_from_unblock_contacts (context);
>+      tp_svc_connection_interface_contact_blocking1_return_from_unblock_contacts (context);
>     }
>   else
>     {
>@@ -4849,7 +4849,7 @@ unblocked_cb (
> 
> static void
> tp_base_contact_list_mixin_unblock_contacts (
>-    TpSvcConnectionInterfaceContactBlocking *svc,
>+    TpSvcConnectionInterfaceContactBlocking1 *svc,
>     const GArray *contacts_arr,
>     DBusGMethodInvocation *context)
> {
>@@ -4869,20 +4869,20 @@ tp_base_contact_list_mixin_unblock_contacts (
> /**
>  * tp_base_contact_list_mixin_blocking_iface_init:
>  * @klass: the service-side D-Bus interface,
>- *  a #TpSvcConnectionInterfaceContactBlockingClass
>+ *  a #TpSvcConnectionInterfaceContactBlocking1Class
>  *
>  * Use the #TpBaseContactList like a mixin, to implement the ContactBlocking
>  * D-Bus interface.
>  *
>  * This function should be passed to G_IMPLEMENT_INTERFACE() for
>- * #TpSvcConnectionInterfaceContactBlocking
>+ * #TpSvcConnectionInterfaceContactBlocking1
>  *
>  * Since: 0.15.1
>  */
> void
> tp_base_contact_list_mixin_blocking_iface_init (gpointer klass)
> {
>-#define IMPLEMENT(x) tp_svc_connection_interface_contact_blocking_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_contact_blocking1_implement_##x (\
>   klass, tp_base_contact_list_mixin_##x)
>   IMPLEMENT (block_contacts);
>   IMPLEMENT (unblock_contacts);
>@@ -4927,14 +4927,14 @@ tp_base_contact_list_get_blocking_dbus_property (GObject *conn,
> /**
>  * tp_base_contact_list_mixin_class_init:
>  * @cls: A subclass of #TpBaseConnection that has a #TpContactsMixinClass,
>- *  and implements #TpSvcConnectionInterfaceContactList using
>+ *  and implements #TpSvcConnectionInterfaceContactList1 using
>  *  #TpBaseContactList
>  *
>  * Register the #TpBaseContactList to be used like a mixin in @cls.
>  * Before this function is called, the #TpContactsMixin must be initialized
>  * with tp_contacts_mixin_class_init().
>  *
>- * If the connection implements #TpSvcConnectionInterfaceContactGroups, this
>+ * If the connection implements #TpSvcConnectionInterfaceContactGroups1, this
>  * function automatically sets up that interface as well as ContactList.
>  * In this case, when the #TpBaseContactList is created later, it must
>  * implement %TP_TYPE_CONTACT_GROUP_LIST.
>@@ -4950,25 +4950,25 @@ tp_base_contact_list_mixin_class_init (TpBaseConnectionClass *cls)
>   g_return_if_fail (TP_IS_BASE_CONNECTION_CLASS (cls));
>   g_return_if_fail (TP_CONTACTS_MIXIN_CLASS (cls) != NULL);
>   g_return_if_fail (g_type_is_a (type,
>-        TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST));
>+        TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1));
> 
>   tp_dbus_properties_mixin_implement_interface (obj_cls,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST,
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST1,
>       tp_base_contact_list_get_list_dbus_property,
>       NULL, known_list_props);
> 
>-  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS))
>+  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1))
>     {
>       tp_dbus_properties_mixin_implement_interface (obj_cls,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>           tp_base_contact_list_get_group_dbus_property,
>           NULL, known_group_props);
>     }
> 
>-  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING))
>+  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
>     {
>       tp_dbus_properties_mixin_implement_interface (obj_cls,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
>           tp_base_contact_list_get_blocking_dbus_property,
>           NULL, known_blocking_props);
>     }
>@@ -4978,14 +4978,14 @@ tp_base_contact_list_mixin_class_init (TpBaseConnectionClass *cls)
>  * tp_base_contact_list_mixin_register_with_contacts_mixin:
>  * @self: a contact list
>  * @conn: An instance of #TpBaseConnection that uses a #TpContactsMixin,
>- *  and implements #TpSvcConnectionInterfaceContactList using
>+ *  and implements #TpSvcConnectionInterfaceContactList1 using
>  *  #TpBaseContactList
>  *
>  * Register the ContactList interface with the Contacts interface to make it
>  * inspectable. Before this function is called, the #TpContactsMixin must be
>  * initialized with tp_contacts_mixin_init().
>  *
>- * If the connection implements #TpSvcConnectionInterfaceContactGroups
>+ * If the connection implements #TpSvcConnectionInterfaceContactGroups1
>  * the #TpBaseContactList implements %TP_TYPE_CONTACT_GROUP_LIST,
>  * this function automatically also registers the ContactGroups interface
>  * with the contacts mixin.
>@@ -5004,25 +5004,25 @@ tp_base_contact_list_mixin_register_with_contacts_mixin (
>   g_return_if_fail (TP_IS_BASE_CONNECTION (conn));
>   g_return_if_fail (self != NULL);
>   g_return_if_fail (g_type_is_a (type,
>-        TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST));
>+        TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1));
> 
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
>       tp_base_contact_list_fill_list_contact_attributes);
> 
>-  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS)
>+  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1)
>       && TP_IS_CONTACT_GROUP_LIST (self))
>     {
>       tp_contacts_mixin_add_contact_attributes_iface (object,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>           tp_base_contact_list_fill_groups_contact_attributes);
>     }
> 
>-  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING)
>+  if (g_type_is_a (type, TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1)
>       && TP_IS_BLOCKABLE_CONTACT_LIST (self))
>     {
>       tp_contacts_mixin_add_contact_attributes_iface (object,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
>           tp_base_contact_list_fill_blocking_contact_attributes);
>     }
> }
>diff --git a/telepathy-glib/base-media-call-channel.c b/telepathy-glib/base-media-call-channel.c
>index 75704ed..175cbb1 100644
>--- a/telepathy-glib/base-media-call-channel.c
>+++ b/telepathy-glib/base-media-call-channel.c
>@@ -96,7 +96,7 @@ static void hold_iface_init (gpointer g_iface, gpointer iface_data);
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseMediaCallChannel,
>     tp_base_media_call_channel, TP_TYPE_BASE_CALL_CHANNEL,
> 
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD1,
>         hold_iface_init)
> )
> 
>@@ -123,8 +123,8 @@ tp_base_media_call_channel_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       tp_base_media_call_channel_parent_class)->get_interfaces (base);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DTMF);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DTMF1);
> 
>   return interfaces;
> }
>@@ -349,7 +349,7 @@ set_hold_state (TpBaseMediaCallChannel *self,
>       if (klass->hold_state_changed != NULL)
>         klass->hold_state_changed (self, hold_state, hold_state_reason);
> 
>-      tp_svc_channel_interface_hold_emit_hold_state_changed (self, hold_state,
>+      tp_svc_channel_interface_hold1_emit_hold_state_changed (self, hold_state,
>           hold_state_reason);
> 
>       update_hold_state (self);
>@@ -461,18 +461,18 @@ hold_change_failed (TpBaseMediaCallChannel *self)
> 
> static void
> tp_base_media_call_channel_get_hold_state (
>-    TpSvcChannelInterfaceHold *hold_iface,
>+    TpSvcChannelInterfaceHold1 *hold_iface,
>     DBusGMethodInvocation *context)
> {
>   TpBaseMediaCallChannel *self = TP_BASE_MEDIA_CALL_CHANNEL (hold_iface);
> 
>-  tp_svc_channel_interface_hold_return_from_get_hold_state (context,
>+  tp_svc_channel_interface_hold1_return_from_get_hold_state (context,
>       self->priv->hold_state, self->priv->hold_state_reason);
> }
> 
> static void
> tp_base_media_call_channel_request_hold (
>-    TpSvcChannelInterfaceHold *hold_iface,
>+    TpSvcChannelInterfaceHold1 *hold_iface,
>     gboolean hold,
>     DBusGMethodInvocation *context)
> {
>@@ -499,16 +499,15 @@ tp_base_media_call_channel_request_hold (
>     }
> 
>  out:
>-  tp_svc_channel_interface_hold_return_from_request_hold (context);
>+  tp_svc_channel_interface_hold1_return_from_request_hold (context);
> }
> 
> static void
> hold_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcChannelInterfaceHoldClass *klass =
>-      (TpSvcChannelInterfaceHoldClass *) g_iface;
>+  TpSvcChannelInterfaceHold1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x, suffix) tp_svc_channel_interface_hold_implement_##x (\
>+#define IMPLEMENT(x, suffix) tp_svc_channel_interface_hold1_implement_##x (\
>     klass, tp_base_media_call_channel_##x##suffix)
>   IMPLEMENT(get_hold_state,);
>   IMPLEMENT(request_hold,);
>diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
>index 6256c06..6e94dd6 100644
>--- a/telepathy-glib/base-media-call-content.c
>+++ b/telepathy-glib/base-media-call-content.c
>@@ -22,12 +22,12 @@
> /**
>  * SECTION:base-media-call-content
>  * @title: TpBaseMediaCallContent
>- * @short_description: base class for #TpSvcCallContentInterfaceMedia
>+ * @short_description: base class for #TpSvcCall1ContentInterfaceMedia
>  *  implementations
>- * @see_also: #TpSvcCallContentInterfaceMedia, #TpBaseCallChannel,
>+ * @see_also: #TpSvcCall1ContentInterfaceMedia, #TpBaseCallChannel,
>  *  #TpBaseCallContent and #TpBaseCallStream
>  *
>- * This base class makes it easier to write #TpSvcCallContentInterfaceMedia
>+ * This base class makes it easier to write #TpSvcCall1ContentInterfaceMedia
>  * implementations by implementing its properties and methods.
>  *
>  * Subclasses must still implement #TpBaseCallContent's virtual methods.
>@@ -80,7 +80,7 @@ static void call_content_media_iface_init (gpointer, gpointer);
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseMediaCallContent,
>     tp_base_media_call_content, TP_TYPE_BASE_CALL_CONTENT,
> 
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_INTERFACE_MEDIA,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_INTERFACE_MEDIA,
>       call_content_media_iface_init)
>     )
> 
>@@ -457,7 +457,7 @@ tp_base_media_call_content_class_init (TpBaseMediaCallContentClass *klass)
>       2, G_TYPE_UINT, G_TYPE_HASH_TABLE);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_MEDIA,
>+      TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_MEDIA,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       content_media_props);
>@@ -477,7 +477,7 @@ set_local_properties (TpBaseMediaCallContent *self,
>   g_signal_emit (self, _signals[LOCAL_MEDIA_DESCRIPTION_UPDATED], 0,
>       contact, properties);
> 
>-  tp_svc_call_content_interface_media_emit_local_media_description_changed (
>+  tp_svc_call1_content_interface_media_emit_local_media_description_changed (
>       self, properties);
> }
> 
>@@ -499,7 +499,7 @@ set_remote_properties (TpBaseMediaCallContent *self,
>       GUINT_TO_POINTER (contact),
>       properties);
> 
>-  tp_svc_call_content_interface_media_emit_remote_media_descriptions_changed (
>+  tp_svc_call1_content_interface_media_emit_remote_media_descriptions_changed (
>       self, update);
> 
>   g_hash_table_unref (update);
>@@ -544,7 +544,7 @@ out:
>   g_clear_object (&self->priv->current_offer);
>   g_clear_object (&self->priv->current_offer_result);
>   g_clear_object (&self->priv->current_offer_cancellable);
>-  tp_svc_call_content_interface_media_emit_media_description_offer_done (self);
>+  tp_svc_call1_content_interface_media_emit_media_description_offer_done (self);
> 
>   next_offer (self);
> 
>@@ -593,7 +593,7 @@ next_offer (TpBaseMediaCallContent *self)
>       self->priv->current_offer);
> 
>   DEBUG ("emitting NewMediaDescriptionOffer: %s", object_path);
>-  tp_svc_call_content_interface_media_emit_new_media_description_offer (self,
>+  tp_svc_call1_content_interface_media_emit_new_media_description_offer (self,
>       object_path, properties);
>   g_hash_table_unref (properties);
> }
>@@ -674,7 +674,7 @@ tp_base_media_call_content_offer_media_description_finish (
> 
> static void
> tp_base_media_call_content_update_local_media_description (
>-    TpSvcCallContentInterfaceMedia *iface,
>+    TpSvcCall1ContentInterfaceMedia *iface,
>     GHashTable *properties,
>     DBusGMethodInvocation *context)
> {
>@@ -685,7 +685,7 @@ tp_base_media_call_content_update_local_media_description (
>   gboolean valid;
> 
>   contact = tp_asv_get_uint32 (properties,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, &valid);
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, &valid);
> 
>   if (!valid)
>     {
>@@ -709,7 +709,7 @@ tp_base_media_call_content_update_local_media_description (
> 
> 
>   codecs = tp_asv_get_boxed (properties,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>       TP_ARRAY_TYPE_CODEC_LIST);
>   if (!codecs || codecs->len == 0)
>     {
>@@ -731,12 +731,12 @@ tp_base_media_call_content_update_local_media_description (
> 
>   set_local_properties (self, contact, properties);
> 
>-  tp_svc_call_content_interface_media_return_from_update_local_media_description
>+  tp_svc_call1_content_interface_media_return_from_update_local_media_description
>       (context);
> }
> 
> static void
>-tp_base_media_call_content_fail (TpSvcCallContentInterfaceMedia *iface,
>+tp_base_media_call_content_fail (TpSvcCall1ContentInterfaceMedia *iface,
>     const GValueArray *reason_array,
>     DBusGMethodInvocation *context)
> {
>@@ -748,12 +748,12 @@ tp_base_media_call_content_fail (TpSvcCallContentInterfaceMedia *iface,
>   _tp_base_call_channel_remove_content_internal (channel, content,
>       reason_array);
> 
>-  tp_svc_call_content_interface_media_return_from_fail (context);
>+  tp_svc_call1_content_interface_media_return_from_fail (context);
> }
> 
> static void
> tp_base_media_call_content_acknowledge_dtmf_change (
>-    TpSvcCallContentInterfaceMedia *iface,
>+    TpSvcCall1ContentInterfaceMedia *iface,
>     guchar in_Event,
>     guint in_State,
>     DBusGMethodInvocation *context)
>@@ -803,7 +803,7 @@ tp_base_media_call_content_acknowledge_dtmf_change (
> 
>   /* Only tell the UI we are sending if we are actually sending */
>   if (in_State == TP_SENDING_STATE_SENDING)
>-    tp_svc_call_content_interface_dtmf_emit_sending_tones (self,
>+    tp_svc_call1_content_interface_dtmf1_emit_sending_tones (self,
>         self->priv->currently_sending_tones);
>   else if (in_State == TP_SENDING_STATE_NONE &&
>       self->priv->currently_sending_tones &&
>@@ -816,7 +816,7 @@ tp_base_media_call_content_acknowledge_dtmf_change (
> 
> out:
> 
>-  tp_svc_call_content_interface_media_return_from_acknowledge_dtmf_change (
>+  tp_svc_call1_content_interface_media_return_from_acknowledge_dtmf_change (
>       context);
> }
> 
>@@ -824,10 +824,9 @@ out:
> static void
> call_content_media_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcCallContentInterfaceMediaClass *klass =
>-    (TpSvcCallContentInterfaceMediaClass *) g_iface;
>+  TpSvcCall1ContentInterfaceMediaClass *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_call_content_interface_media_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_call1_content_interface_media_implement_##x (\
>     klass, tp_base_media_call_content_##x)
>   IMPLEMENT(update_local_media_description);
>   IMPLEMENT(acknowledge_dtmf_change);
>@@ -1068,7 +1067,7 @@ tp_base_media_call_content_dtmf_next (TpBaseMediaCallContent *self)
>         {
>           self->priv->current_dtmf_state =
>               TP_SENDING_STATE_PENDING_STOP_SENDING;
>-          tp_svc_call_content_interface_media_emit_dtmf_change_requested (self,
>+          tp_svc_call1_content_interface_media_emit_dtmf_change_requested (self,
>               self->priv->current_dtmf_event,
>               self->priv->current_dtmf_state);
>           return;
>@@ -1083,7 +1082,7 @@ tp_base_media_call_content_dtmf_next (TpBaseMediaCallContent *self)
>           self->priv->current_dtmf_state =
>               TP_SENDING_STATE_PENDING_STOP_SENDING;
> 
>-          tp_svc_call_content_interface_media_emit_dtmf_change_requested (self,
>+          tp_svc_call1_content_interface_media_emit_dtmf_change_requested (self,
>               self->priv->current_dtmf_event,
>               self->priv->current_dtmf_state);
>         }
>@@ -1118,21 +1117,21 @@ tp_base_media_call_content_dtmf_next (TpBaseMediaCallContent *self)
>                 self->priv->current_dtmf_event = _tp_dtmf_char_to_event (next);
>                 self->priv->current_dtmf_state = TP_SENDING_STATE_PENDING_SEND;
> 
>-                tp_svc_call_content_interface_media_emit_dtmf_change_requested (
>+                tp_svc_call1_content_interface_media_emit_dtmf_change_requested (
>                     self, self->priv->current_dtmf_event,
>                     self->priv->current_dtmf_state);
>                 break;
>               case DTMF_CHAR_CLASS_PAUSE:
>                 self->priv->tones_pause_timeout_id = g_timeout_add (
>                     DTMF_PAUSE_MS, dtmf_pause_timeout_func, self);
>-                tp_svc_call_content_interface_dtmf_emit_sending_tones (self,
>+                tp_svc_call1_content_interface_dtmf1_emit_sending_tones (self,
>                     self->priv->currently_sending_tones);
>                 break;
>               case DTMF_CHAR_CLASS_WAIT_FOR_USER:
>                 self->priv->deferred_tones =
>                     g_strdup (self->priv->currently_sending_tones + 1);
>                 self->priv->currently_sending_tones = "";
>-                tp_svc_call_content_interface_dtmf_emit_tones_deferred (self,
>+                tp_svc_call1_content_interface_dtmf1_emit_tones_deferred (self,
>                     self->priv->deferred_tones);
> 
>                 /* Let's stop here ! */
>@@ -1145,7 +1144,7 @@ tp_base_media_call_content_dtmf_next (TpBaseMediaCallContent *self)
>         else
>           {
>           done:
>-            tp_svc_call_content_interface_dtmf_emit_stopped_tones (self,
>+            tp_svc_call1_content_interface_dtmf1_emit_stopped_tones (self,
>                 self->priv->tones_cancelled && self->priv->multiple_tones);
>             self->priv->tones_cancelled = FALSE;
>             g_free (self->priv->requested_tones);
>@@ -1167,10 +1166,10 @@ tp_base_media_call_content_get_interfaces (TpBaseCallContent *bcc)
>   interfaces = TP_BASE_CALL_CONTENT_CLASS (
>       tp_base_media_call_content_parent_class)->get_interfaces (bcc);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA);
>+  g_ptr_array_add (interfaces, TP_IFACE_CALL1_CONTENT_INTERFACE_MEDIA);
> 
>   if (tp_base_call_content_get_media_type (bcc) == TP_MEDIA_STREAM_TYPE_AUDIO)
>-    g_ptr_array_add (interfaces, TP_IFACE_CALL_CONTENT_INTERFACE_DTMF);
>+    g_ptr_array_add (interfaces, TP_IFACE_CALL1_CONTENT_INTERFACE_DTMF1);
> 
>   return interfaces;
> }
>diff --git a/telepathy-glib/base-media-call-stream.c b/telepathy-glib/base-media-call-stream.c
>index 94b1199..47f1d67 100644
>--- a/telepathy-glib/base-media-call-stream.c
>+++ b/telepathy-glib/base-media-call-stream.c
>@@ -23,12 +23,12 @@
> /**
>  * SECTION:base-media-call-stream
>  * @title: TpBaseMediaCallStream
>- * @short_description: base class for #TpSvcCallStreamInterfaceMedia
>+ * @short_description: base class for #TpSvcCall1StreamInterfaceMedia
>  *  implementations
>- * @see_also: #TpSvcCallStreamInterfaceMedia, #TpBaseCallChannel,
>+ * @see_also: #TpSvcCall1StreamInterfaceMedia, #TpBaseCallChannel,
>  *  #TpBaseCallStream and #TpBaseCallContent
>  *
>- * This base class makes it easier to write #TpSvcCallStreamInterfaceMedia
>+ * This base class makes it easier to write #TpSvcCall1StreamInterfaceMedia
>  * implementations by implementing some of its properties and methods.
>  *
>  * Subclasses must still implement #TpBaseCallStream's virtual methods plus
>@@ -170,7 +170,7 @@ static void call_stream_media_iface_init (gpointer, gpointer);
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseMediaCallStream,
>     tp_base_media_call_stream, TP_TYPE_BASE_CALL_STREAM,
> 
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_STREAM_INTERFACE_MEDIA,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_STREAM_INTERFACE_MEDIA,
>       call_stream_media_iface_init)
>     )
> 
>@@ -551,7 +551,7 @@ tp_base_media_call_stream_class_init (TpBaseMediaCallStreamClass *klass)
>       param_spec);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA,
>+      TP_IFACE_QUARK_CALL1_STREAM_INTERFACE_MEDIA,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       stream_media_props);
>@@ -603,7 +603,7 @@ maybe_got_server_info (TpBaseMediaCallStream *self)
>       tp_base_call_stream_get_object_path ((TpBaseCallStream *) self));
> 
>   self->priv->has_server_info = TRUE;
>-  tp_svc_call_stream_interface_media_emit_server_info_retrieved (self);
>+  tp_svc_call1_stream_interface_media_emit_server_info_retrieved (self);
> }
> 
> /**
>@@ -664,7 +664,7 @@ tp_base_media_call_stream_set_stun_servers (TpBaseMediaCallStream *self,
> 
>   self->priv->stun_servers = g_ptr_array_ref (stun_servers);
> 
>-  tp_svc_call_stream_interface_media_emit_stun_servers_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_stun_servers_changed (self,
>       self->priv->stun_servers);
> 
>   maybe_got_server_info (self);
>@@ -693,7 +693,7 @@ tp_base_media_call_stream_set_relay_info (TpBaseMediaCallStream *self,
>   tp_clear_pointer (&self->priv->relay_info, g_ptr_array_unref);
>   self->priv->relay_info = g_ptr_array_ref (relays);
> 
>-  tp_svc_call_stream_interface_media_emit_relay_info_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_relay_info_changed (self,
>       self->priv->relay_info);
> 
>   maybe_got_server_info (self);
>@@ -733,7 +733,7 @@ tp_base_media_call_stream_add_endpoint (TpBaseMediaCallStream *self,
>   removed = g_ptr_array_new ();
>   g_ptr_array_add (added, (gpointer) object_path);
> 
>-  tp_svc_call_stream_interface_media_emit_endpoints_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_endpoints_changed (self,
>       added, removed);
> 
>   g_ptr_array_unref (added);
>@@ -774,7 +774,7 @@ tp_base_media_call_stream_remove_endpoint (TpBaseMediaCallStream *self,
>   removed = g_ptr_array_new ();
>   g_ptr_array_add (removed, (gpointer) object_path);
> 
>-  tp_svc_call_stream_interface_media_emit_endpoints_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_endpoints_changed (self,
>       added, removed);
> 
>   g_ptr_array_unref (added);
>@@ -853,7 +853,7 @@ set_sending_state (TpBaseMediaCallStream *self,
>   self->priv->sending_state = state;
>   g_object_notify (G_OBJECT (self), "sending-state");
> 
>-  tp_svc_call_stream_interface_media_emit_sending_state_changed (self, state);
>+  tp_svc_call1_stream_interface_media_emit_sending_state_changed (self, state);
> }
> 
> /**
>@@ -988,7 +988,7 @@ set_receiving_state (TpBaseMediaCallStream *self,
>   self->priv->receiving_state = state;
>   g_object_notify (G_OBJECT (self), "receiving-state");
> 
>-  tp_svc_call_stream_interface_media_emit_receiving_state_changed (self, state);
>+  tp_svc_call1_stream_interface_media_emit_receiving_state_changed (self, state);
> }
> 
> /**
>@@ -1128,7 +1128,7 @@ tp_base_media_call_stream_get_interfaces (TpBaseCallStream *bcs)
>   interfaces = TP_BASE_CALL_STREAM_CLASS (
>       tp_base_media_call_stream_parent_class)->get_interfaces (bcs);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CALL_STREAM_INTERFACE_MEDIA);
>+  g_ptr_array_add (interfaces, TP_IFACE_CALL1_STREAM_INTERFACE_MEDIA);
> 
>   return interfaces;
> }
>@@ -1201,7 +1201,7 @@ correct_state_transition (TpStreamFlowState old_state,
> 
> static void
> tp_base_media_call_stream_complete_sending_state_change (
>-    TpSvcCallStreamInterfaceMedia *iface,
>+    TpSvcCall1StreamInterfaceMedia *iface,
>     TpStreamFlowState state,
>     DBusGMethodInvocation *context)
> {
>@@ -1232,14 +1232,14 @@ tp_base_media_call_stream_complete_sending_state_change (
> 
>   self->priv->sending_stop_requested = FALSE;
> 
>-  tp_svc_call_stream_interface_media_emit_sending_state_changed (self, state);
>-  tp_svc_call_stream_interface_media_return_from_complete_sending_state_change
>+  tp_svc_call1_stream_interface_media_emit_sending_state_changed (self, state);
>+  tp_svc_call1_stream_interface_media_return_from_complete_sending_state_change
>       (context);
> }
> 
> static void
> tp_base_media_call_stream_report_sending_failure (
>-    TpSvcCallStreamInterfaceMedia *iface,
>+    TpSvcCall1StreamInterfaceMedia *iface,
>     TpCallStateChangeReason reason,
>     const gchar *dbus_reason,
>     const gchar *message,
>@@ -1275,19 +1275,19 @@ tp_base_media_call_stream_report_sending_failure (
>     }
> 
>   g_object_notify (G_OBJECT (self), "sending-state");
>-  tp_svc_call_stream_interface_media_emit_sending_state_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_sending_state_changed (self,
>       self->priv->sending_state);
> 
>   self->priv->sending_failure = FALSE;
> 
> done:
>-  tp_svc_call_stream_interface_media_return_from_report_sending_failure (
>+  tp_svc_call1_stream_interface_media_return_from_report_sending_failure (
>       context);
> }
> 
> static void
> tp_base_media_call_stream_complete_receiving_state_change (
>-    TpSvcCallStreamInterfaceMedia *iface,
>+    TpSvcCall1StreamInterfaceMedia *iface,
>     TpStreamFlowState state,
>     DBusGMethodInvocation *context)
> {
>@@ -1327,14 +1327,14 @@ tp_base_media_call_stream_complete_receiving_state_change (
>       tp_intset_clear (self->priv->receiving_requests);
>     }
> 
>-  tp_svc_call_stream_interface_media_emit_receiving_state_changed (self, state);
>-  tp_svc_call_stream_interface_media_return_from_complete_receiving_state_change
>+  tp_svc_call1_stream_interface_media_emit_receiving_state_changed (self, state);
>+  tp_svc_call1_stream_interface_media_return_from_complete_receiving_state_change
>       (context);
> }
> 
> static void
> tp_base_media_call_stream_report_receiving_failure (
>-    TpSvcCallStreamInterfaceMedia *iface,
>+    TpSvcCall1StreamInterfaceMedia *iface,
>     TpCallStateChangeReason reason,
>     const gchar *dbus_reason,
>     const gchar *message,
>@@ -1367,18 +1367,18 @@ tp_base_media_call_stream_report_receiving_failure (
>     klass->report_receiving_failure (self, old_state,
>         reason, dbus_reason, message);
> 
>-  tp_svc_call_stream_interface_media_emit_receiving_state_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_receiving_state_changed (self,
>       self->priv->receiving_state);
> 
>   self->priv->receiving_failure = FALSE;
> 
> done:
>-  tp_svc_call_stream_interface_media_return_from_report_receiving_failure (
>+  tp_svc_call1_stream_interface_media_return_from_report_receiving_failure (
>       context);
> }
> 
> static void
>-tp_base_media_call_stream_set_credentials (TpSvcCallStreamInterfaceMedia *iface,
>+tp_base_media_call_stream_set_credentials (TpSvcCall1StreamInterfaceMedia *iface,
>     const gchar *username,
>     const gchar *password,
>     DBusGMethodInvocation *context)
>@@ -1397,14 +1397,14 @@ tp_base_media_call_stream_set_credentials (TpSvcCallStreamInterfaceMedia *iface,
>   g_object_notify (G_OBJECT (self), "local-candidates");
>   g_object_notify (G_OBJECT (self), "local-credentials");
> 
>-  tp_svc_call_stream_interface_media_emit_local_credentials_changed (self,
>+  tp_svc_call1_stream_interface_media_emit_local_credentials_changed (self,
>       username, password);
> 
>-  tp_svc_call_stream_interface_media_return_from_set_credentials (context);
>+  tp_svc_call1_stream_interface_media_return_from_set_credentials (context);
> }
> 
> static void
>-tp_base_media_call_stream_add_candidates (TpSvcCallStreamInterfaceMedia *iface,
>+tp_base_media_call_stream_add_candidates (TpSvcCall1StreamInterfaceMedia *iface,
>     const GPtrArray *candidates,
>     DBusGMethodInvocation *context)
> {
>@@ -1445,16 +1445,16 @@ tp_base_media_call_stream_add_candidates (TpSvcCallStreamInterfaceMedia *iface,
>       G_GNUC_END_IGNORE_DEPRECATIONS
>     }
> 
>-  tp_svc_call_stream_interface_media_emit_local_candidates_added (self,
>+  tp_svc_call1_stream_interface_media_emit_local_candidates_added (self,
>       accepted_candidates);
>-  tp_svc_call_stream_interface_media_return_from_add_candidates (context);
>+  tp_svc_call1_stream_interface_media_return_from_add_candidates (context);
> 
>   g_ptr_array_unref (accepted_candidates);
> }
> 
> static void
> tp_base_media_call_stream_finish_initial_candidates (
>-    TpSvcCallStreamInterfaceMedia *iface,
>+    TpSvcCall1StreamInterfaceMedia *iface,
>     DBusGMethodInvocation *context)
> {
>   TpBaseMediaCallStream *self = TP_BASE_MEDIA_CALL_STREAM (iface);
>@@ -1470,12 +1470,12 @@ tp_base_media_call_stream_finish_initial_candidates (
>         return;
>       }
> 
>-  tp_svc_call_stream_interface_media_return_from_finish_initial_candidates (
>+  tp_svc_call1_stream_interface_media_return_from_finish_initial_candidates (
>       context);
> }
> 
> static void
>-tp_base_media_call_stream_fail (TpSvcCallStreamInterfaceMedia *iface,
>+tp_base_media_call_stream_fail (TpSvcCall1StreamInterfaceMedia *iface,
>     const GValueArray *reason_array,
>     DBusGMethodInvocation *context)
> {
>@@ -1496,16 +1496,15 @@ tp_base_media_call_stream_fail (TpSvcCallStreamInterfaceMedia *iface,
>           reason_array);
>     }
> 
>-  tp_svc_call_stream_interface_media_return_from_fail (context);
>+  tp_svc_call1_stream_interface_media_return_from_fail (context);
> }
> 
> static void
> call_stream_media_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcCallStreamInterfaceMediaClass *klass =
>-      (TpSvcCallStreamInterfaceMediaClass *) g_iface;
>+  TpSvcCall1StreamInterfaceMediaClass *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_call_stream_interface_media_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_call1_stream_interface_media_implement_##x (\
>     klass, tp_base_media_call_stream_##x)
>   IMPLEMENT(complete_sending_state_change);
>   IMPLEMENT(report_sending_failure);
>diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
>index 7ca4ca2..44c154f 100644
>--- a/telepathy-glib/base-password-channel.c
>+++ b/telepathy-glib/base-password-channel.c
>@@ -69,9 +69,9 @@ static void sasl_auth_iface_init (gpointer g_iface, gpointer iface_data);
> 
> G_DEFINE_TYPE_WITH_CODE (TpBasePasswordChannel, tp_base_password_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
>         NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>         sasl_auth_iface_init));
> 
> static const gchar *tp_base_password_channel_available_mechanisms[] = {
>@@ -131,7 +131,7 @@ tp_base_password_channel_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       tp_base_password_channel_parent_class)->get_interfaces (base);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1);
> 
>   return interfaces;
> }
>@@ -199,7 +199,7 @@ tp_base_password_channel_get_property (GObject *object,
>     {
>     case PROP_AUTHENTICATION_METHOD:
>       g_value_set_static_string (value,
>-          TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION);
>+          TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1);
>       break;
>     case PROP_AVAILABLE_MECHANISMS:
>       g_value_set_boxed (value,
>@@ -267,12 +267,12 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-    { TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
>+    { TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       server_base_password_props,
>     },
>-    { TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+    { TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       sasl_auth_props,
>@@ -290,7 +290,7 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
>   object_class->get_property = tp_base_password_channel_get_property;
>   object_class->finalize = tp_base_password_channel_finalize;
> 
>-  chan_class->channel_type = TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION;
>+  chan_class->channel_type = TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1;
>   chan_class->target_handle_type = TP_HANDLE_TYPE_NONE;
>   chan_class->get_interfaces = tp_base_password_channel_get_interfaces;
>   chan_class->close = tp_base_password_channel_close;
>@@ -447,7 +447,7 @@ tp_base_password_channel_change_status (TpBasePasswordChannel *channel,
>   g_free (priv->sasl_error);
>   priv->sasl_error = g_strdup (new_sasl_error);
> 
>-  tp_svc_channel_interface_sasl_authentication_emit_sasl_status_changed (
>+  tp_svc_channel_interface_sasl_authentication1_emit_sasl_status_changed (
>       channel, priv->sasl_status, priv->sasl_error, priv->sasl_error_details);
> }
> 
>@@ -488,20 +488,20 @@ tp_base_password_channel_fill_immutable_properties (TpBaseChannel *chan,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION, "AuthenticationMethod",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "AvailableMechanisms",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "HasInitialData",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "CanTryAgain",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "AuthorizationIdentity",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "DefaultUsername",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "DefaultRealm",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "MaySaveResponse",
>+      TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1, "AuthenticationMethod",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "AvailableMechanisms",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "HasInitialData",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "CanTryAgain",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "AuthorizationIdentity",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "DefaultUsername",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "DefaultRealm",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "MaySaveResponse",
>       NULL);
> }
> 
> static void
> tp_base_password_channel_start_mechanism_with_data (
>-    TpSvcChannelInterfaceSASLAuthentication *self,
>+    TpSvcChannelInterfaceSASLAuthentication1 *self,
>     const gchar *mechanism,
>     const GArray *initial_data,
>     DBusGMethodInvocation *context)
>@@ -542,7 +542,7 @@ tp_base_password_channel_start_mechanism_with_data (
>   tp_base_password_channel_change_status (channel,
>       TP_SASL_STATUS_SERVER_SUCCEEDED, "");
> 
>-  tp_svc_channel_interface_sasl_authentication_return_from_start_mechanism_with_data (
>+  tp_svc_channel_interface_sasl_authentication1_return_from_start_mechanism_with_data (
>       context);
> 
>   return;
>@@ -555,7 +555,7 @@ error:
> 
> static void
> tp_base_password_channel_accept_sasl (
>-    TpSvcChannelInterfaceSASLAuthentication *self,
>+    TpSvcChannelInterfaceSASLAuthentication1 *self,
>     DBusGMethodInvocation *context)
> {
>   TpBasePasswordChannel *channel = TP_BASE_PASSWORD_CHANNEL (self);
>@@ -575,13 +575,13 @@ tp_base_password_channel_accept_sasl (
> 
>   g_signal_emit (channel, signals[FINISHED], 0, priv->password, 0, 0, NULL);
> 
>-  tp_svc_channel_interface_sasl_authentication_return_from_accept_sasl (
>+  tp_svc_channel_interface_sasl_authentication1_return_from_accept_sasl (
>       context);
> }
> 
> static void
> tp_base_password_channel_abort_sasl (
>-    TpSvcChannelInterfaceSASLAuthentication *self,
>+    TpSvcChannelInterfaceSASLAuthentication1 *self,
>     TpSASLAbortReason reason,
>     const gchar *debug_message,
>     DBusGMethodInvocation *context)
>@@ -616,7 +616,7 @@ tp_base_password_channel_abort_sasl (
>           TP_ERROR_CANCELLED, "AbortSASL was called");
>     }
> 
>-  tp_svc_channel_interface_sasl_authentication_return_from_abort_sasl (
>+  tp_svc_channel_interface_sasl_authentication1_return_from_abort_sasl (
>       context);
> }
> 
>@@ -624,7 +624,7 @@ static void
> sasl_auth_iface_init (gpointer g_iface,
>     gpointer iface_data)
> {
>-#define IMPLEMENT(x) tp_svc_channel_interface_sasl_authentication_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_interface_sasl_authentication1_implement_##x (\
>     g_iface, tp_base_password_channel_##x)
>   IMPLEMENT(start_mechanism_with_data);
>   IMPLEMENT(accept_sasl);
>diff --git a/telepathy-glib/base-protocol.c b/telepathy-glib/base-protocol.c
>index ca90649..84d83f2 100644
>--- a/telepathy-glib/base-protocol.c
>+++ b/telepathy-glib/base-protocol.c
>@@ -572,19 +572,19 @@ tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec,
>  */
> 
> static void protocol_iface_init (TpSvcProtocolClass *cls);
>-static void presence_iface_init (TpSvcProtocolInterfacePresenceClass *cls);
>-static void addressing_iface_init (TpSvcProtocolInterfaceAddressingClass *cls);
>+static void presence_iface_init (TpSvcProtocolInterfacePresence1Class *cls);
>+static void addressing_iface_init (TpSvcProtocolInterfaceAddressing1Class *cls);
> 
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpBaseProtocol, tp_base_protocol,
>     G_TYPE_OBJECT,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>       tp_dbus_properties_mixin_iface_init);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL, protocol_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENCE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENCE1,
>       presence_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS1,
>       NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESSING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESSING1,
>       addressing_iface_init))
> 
> G_DEFINE_INTERFACE (TpProtocolAddressing, tp_protocol_addressing,
>@@ -817,28 +817,28 @@ tp_base_protocol_get_immutable_properties (TpBaseProtocol *self)
>   if (cls->get_avatar_details != NULL)
>     {
>       tp_dbus_properties_mixin_fill_properties_hash ((GObject *) self, table,
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "SupportedAvatarMIMETypes",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "MinimumAvatarHeight",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "MinimumAvatarWidth",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "RecommendedAvatarHeight",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "RecommendedAvatarWidth",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "MaximumAvatarHeight",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "MaximumAvatarWidth",
>-          TP_IFACE_PROTOCOL_INTERFACE_AVATARS, "MaximumAvatarBytes",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "SupportedAvatarMIMETypes",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "MinimumAvatarHeight",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "MinimumAvatarWidth",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "RecommendedAvatarHeight",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "RecommendedAvatarWidth",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "MaximumAvatarHeight",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "MaximumAvatarWidth",
>+          TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, "MaximumAvatarBytes",
>           NULL);
>     }
> 
>   if (tp_strv_contains ((const gchar * const *) self->priv->interfaces,
>-          TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING))
>+          TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1))
>     tp_dbus_properties_mixin_fill_properties_hash ((GObject *) self, table,
>-        TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING, "AddressableVCardFields",
>-        TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING, "AddressableURISchemes",
>+        TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1, "AddressableVCardFields",
>+        TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1, "AddressableURISchemes",
>         NULL);
> 
>   if (tp_strv_contains ((const gchar * const *) self->priv->interfaces,
>-          TP_IFACE_PROTOCOL_INTERFACE_PRESENCE))
>+          TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1))
>     tp_dbus_properties_mixin_fill_properties_hash ((GObject *) self, table,
>-        TP_IFACE_PROTOCOL_INTERFACE_PRESENCE, "Statuses",
>+        TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1, "Statuses",
>         NULL);
> 
>   return table;
>@@ -1229,11 +1229,11 @@ tp_base_protocol_class_init (TpBaseProtocolClass *klass)
> 
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>       { TP_IFACE_PROTOCOL, protocol_properties_getter, NULL, channel_props },
>-      { TP_IFACE_PROTOCOL_INTERFACE_PRESENCE, protocol_prop_presence_getter,
>+      { TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1, protocol_prop_presence_getter,
>         NULL, presence_props },
>-      { TP_IFACE_PROTOCOL_INTERFACE_AVATARS, protocol_prop_avatar_getter,
>+      { TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, protocol_prop_avatar_getter,
>         NULL, avatar_props },
>-      { TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING,
>+      { TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1,
>         protocol_prop_addressing_getter, NULL, addressing_props },
>       { NULL }
>   };
>@@ -1798,7 +1798,7 @@ protocol_identify_account (TpSvcProtocol *protocol,
> }
> 
> static void
>-addressing_normalize_contact_uri (TpSvcProtocolInterfaceAddressing *protocol,
>+addressing_normalize_contact_uri (TpSvcProtocolInterfaceAddressing1 *protocol,
>     const gchar *uri,
>     DBusGMethodInvocation *context)
> {
>@@ -1824,7 +1824,7 @@ addressing_normalize_contact_uri (TpSvcProtocolInterfaceAddressing *protocol,
>       return;
>     }
> 
>-  tp_svc_protocol_interface_addressing_return_from_normalize_contact_uri (context,
>+  tp_svc_protocol_interface_addressing1_return_from_normalize_contact_uri (context,
>       ret);
> 
>   g_free (ret);
>@@ -1836,7 +1836,7 @@ addressing_normalize_contact_uri (TpSvcProtocolInterfaceAddressing *protocol,
> }
> 
> static void
>-addressing_normalize_vcard_address (TpSvcProtocolInterfaceAddressing *protocol,
>+addressing_normalize_vcard_address (TpSvcProtocolInterfaceAddressing1 *protocol,
>     const gchar *vcard_field,
>     const gchar *vcard_address,
>     DBusGMethodInvocation *context)
>@@ -1864,7 +1864,7 @@ addressing_normalize_vcard_address (TpSvcProtocolInterfaceAddressing *protocol,
>       return;
>     }
> 
>-  tp_svc_protocol_interface_addressing_return_from_normalize_vcard_address (
>+  tp_svc_protocol_interface_addressing1_return_from_normalize_vcard_address (
>       context,
>       ret);
> 
>@@ -1887,14 +1887,14 @@ protocol_iface_init (TpSvcProtocolClass *cls)
> }
> 
> static void
>-presence_iface_init (TpSvcProtocolInterfacePresenceClass *cls)
>+presence_iface_init (TpSvcProtocolInterfacePresence1Class *cls)
> {
> }
> 
> static void
>-addressing_iface_init (TpSvcProtocolInterfaceAddressingClass *cls)
>+addressing_iface_init (TpSvcProtocolInterfaceAddressing1Class *cls)
> {
>-#define IMPLEMENT(x) tp_svc_protocol_interface_addressing_implement_##x (cls, addressing_##x)
>+#define IMPLEMENT(x) tp_svc_protocol_interface_addressing1_implement_##x (cls, addressing_##x)
>   IMPLEMENT (normalize_contact_uri);
>   IMPLEMENT (normalize_vcard_address);
> #undef IMPLEMENT
>diff --git a/telepathy-glib/base-room-config.c b/telepathy-glib/base-room-config.c
>index d37e62d..f948886 100644
>--- a/telepathy-glib/base-room-config.c
>+++ b/telepathy-glib/base-room-config.c
>@@ -719,7 +719,7 @@ tp_base_room_config_register_class (
>   GObjectClass *cls = G_OBJECT_CLASS (base_channel_class);
> 
>   tp_dbus_properties_mixin_implement_interface (cls,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG1,
>       room_config_getter, NULL, room_config_properties);
> }
> 
>@@ -759,7 +759,7 @@ validate_property_type (
> 
>   if (G_UNLIKELY (iface_info == NULL))
>     iface_info = tp_svc_interface_get_dbus_properties_info (
>-          TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG);
>+          TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1);
> 
>   g_return_val_if_fail (iface_info != NULL, FALSE);
> 
>@@ -893,7 +893,7 @@ update_cb (
>         }
> 
>       tp_base_room_config_emit_properties_changed (self);
>-      tp_svc_channel_interface_room_config_return_from_update_configuration (
>+      tp_svc_channel_interface_room_config1_return_from_update_configuration (
>           priv->update_configuration_ctx);
>     }
>   else
>@@ -920,7 +920,7 @@ tp_base_room_config_update_finish (
> 
> static void
> tp_base_room_config_update_configuration (
>-    TpSvcChannelInterfaceRoomConfig *iface,
>+    TpSvcChannelInterfaceRoomConfig1 *iface,
>     GHashTable *properties,
>     DBusGMethodInvocation *context)
> {
>@@ -974,7 +974,7 @@ tp_base_room_config_update_configuration (
> 
>   if (g_hash_table_size (properties) == 0)
>     {
>-      tp_svc_channel_interface_room_config_return_from_update_configuration (
>+      tp_svc_channel_interface_room_config1_return_from_update_configuration (
>           context);
>       return;
>     }
>@@ -1020,7 +1020,7 @@ tp_base_room_config_iface_init (
>     gpointer g_iface,
>     gpointer iface_data)
> {
>-#define IMPLEMENT(x) tp_svc_channel_interface_room_config_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_interface_room_config1_implement_##x (\
>     g_iface, tp_base_room_config_##x)
>   IMPLEMENT (update_configuration);
> #undef IMPLEMENT
>@@ -1176,7 +1176,7 @@ tp_base_room_config_emit_properties_changed (
>               g_strjoinv (", ", (gchar **) changed->pdata));
>           tp_dbus_properties_mixin_emit_properties_changed (
>               G_OBJECT (priv->channel),
>-              TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG,
>+              TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1,
>               (const gchar * const *) changed->pdata);
>         }
> 
>@@ -1219,7 +1219,7 @@ tp_base_room_config_set_retrieved (
>       priv->configuration_retrieved = TRUE;
>       tp_dbus_properties_mixin_emit_properties_changed_varargs (
>           G_OBJECT (priv->channel),
>-          TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG,
>+          TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1,
>           "ConfigurationRetrieved", NULL);
>     }
> }
>diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
>index c354457..ae89c44 100644
>--- a/telepathy-glib/call-channel.c
>+++ b/telepathy-glib/call-channel.c
>@@ -670,13 +670,13 @@ _tp_call_channel_prepare_core_async (TpProxy *proxy,
>   TpCallChannel *self = (TpCallChannel *) proxy;
>   TpChannel *channel = (TpChannel *) self;
> 
>-  tp_cli_channel_type_call_connect_to_content_added (channel,
>+  tp_cli_channel_type_call1_connect_to_content_added (channel,
>       content_added_cb, NULL, NULL, NULL, NULL);
>-  tp_cli_channel_type_call_connect_to_content_removed (channel,
>+  tp_cli_channel_type_call1_connect_to_content_removed (channel,
>       content_removed_cb, NULL, NULL, NULL, NULL);
>-  tp_cli_channel_type_call_connect_to_call_state_changed (channel,
>+  tp_cli_channel_type_call1_connect_to_call_state_changed (channel,
>       call_state_changed_cb, NULL, NULL, NULL, NULL);
>-  tp_cli_channel_type_call_connect_to_call_members_changed (channel,
>+  tp_cli_channel_type_call1_connect_to_call_members_changed (channel,
>       call_members_changed_cb, NULL, NULL, NULL, NULL);
> 
>   g_assert (self->priv->core_result == NULL);
>@@ -684,16 +684,16 @@ _tp_call_channel_prepare_core_async (TpProxy *proxy,
>       callback, user_data, _tp_call_channel_prepare_core_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CHANNEL_TYPE_CALL,
>+      TP_IFACE_CHANNEL_TYPE_CALL1,
>       got_all_properties_cb, NULL, NULL, NULL);
> 
>   if (tp_proxy_has_interface_by_id (proxy,
>-          TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD))
>+          TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD1))
>     {
>-      tp_cli_channel_interface_hold_connect_to_hold_state_changed (channel,
>+      tp_cli_channel_interface_hold1_connect_to_hold_state_changed (channel,
>           hold_state_changed_cb, NULL, NULL, NULL, NULL);
> 
>-      tp_cli_channel_interface_hold_call_get_hold_state (channel, -1,
>+      tp_cli_channel_interface_hold1_call_get_hold_state (channel, -1,
>           got_hold_state_cb, NULL, NULL, NULL);
>     }
> }
>@@ -709,17 +709,17 @@ tp_call_channel_constructed (GObject *obj)
> 
>   /* We can already set immutable properties */
>   self->priv->hardware_streaming = tp_asv_get_boolean (properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_HARDWARE_STREAMING, NULL);
>+        TP_PROP_CHANNEL_TYPE_CALL1_HARDWARE_STREAMING, NULL);
>   self->priv->initial_audio = tp_asv_get_boolean (properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL);
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL);
>   self->priv->initial_video = tp_asv_get_boolean (properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL);
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL);
>   self->priv->initial_audio_name = g_strdup (tp_asv_get_string (properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME));
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME));
>   self->priv->initial_video_name = g_strdup (tp_asv_get_string (properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME));
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME));
>   self->priv->mutable_contents = tp_asv_get_boolean (properties,
>-        TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS, NULL);
>+        TP_PROP_CHANNEL_TYPE_CALL1_MUTABLE_CONTENTS, NULL);
> 
>   if (!self->priv->initial_audio)
>     tp_clear_pointer (&self->priv->initial_audio_name, g_free);
>@@ -1364,7 +1364,7 @@ tp_call_channel_has_dtmf (TpCallChannel *self)
>       TpCallContent *content = g_ptr_array_index (self->priv->contents, i);
> 
>       if (tp_proxy_has_interface_by_id (content,
>-              TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF))
>+              TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_DTMF1))
>         return TRUE;
>     }
> 
>@@ -1390,7 +1390,7 @@ tp_call_channel_has_hold (TpCallChannel *self)
>       tp_proxy_is_prepared (self, TP_CALL_CHANNEL_FEATURE_CORE), FALSE);
> 
>   return tp_proxy_has_interface_by_id (self,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD);
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD1);
> }
> 
> static void
>@@ -1432,7 +1432,7 @@ tp_call_channel_set_ringing_async (TpCallChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_channel_set_ringing_async);
> 
>-  tp_cli_channel_type_call_call_set_ringing (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_call1_call_set_ringing (TP_CHANNEL (self), -1,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -1477,7 +1477,7 @@ tp_call_channel_set_queued_async (TpCallChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_channel_set_queued_async);
> 
>-  tp_cli_channel_type_call_call_set_queued (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_call1_call_set_queued (TP_CHANNEL (self), -1,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -1528,7 +1528,7 @@ tp_call_channel_accept_async (TpCallChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_channel_accept_async);
> 
>-  tp_cli_channel_type_call_call_accept (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_call1_call_accept (TP_CHANNEL (self), -1,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -1580,7 +1580,7 @@ tp_call_channel_hangup_async (TpCallChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_channel_hangup_async);
> 
>-  tp_cli_channel_type_call_call_hangup (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_call1_call_hangup (TP_CHANNEL (self), -1,
>       reason, detailed_reason, message,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
>@@ -1659,7 +1659,7 @@ tp_call_channel_add_content_async (TpCallChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_channel_add_content_async);
> 
>-  tp_cli_channel_type_call_call_add_content (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_call1_call_add_content (TP_CHANNEL (self), -1,
>       name, type, initial_direction,
>       add_content_cb, result, g_object_unref, G_OBJECT (self));
> }
>@@ -1748,7 +1748,7 @@ tp_call_channel_send_tones_async (TpCallChannel *self,
>       TpCallContent *content = g_ptr_array_index (self->priv->contents, i);
> 
>       if (!tp_proxy_has_interface_by_id (content,
>-              TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF))
>+              TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_DTMF1))
>         continue;
> 
>       count++;
>@@ -1812,7 +1812,7 @@ tp_call_channel_request_hold_async (TpCallChannel *self,
> 
>     if (tp_call_channel_has_hold (self))
>       {
>-        tp_cli_channel_interface_hold_call_request_hold (TP_CHANNEL (self), -1,
>+        tp_cli_channel_interface_hold1_call_request_hold (TP_CHANNEL (self), -1,
>             hold, generic_async_cb, g_object_ref (result), g_object_unref,
>             G_OBJECT (self));
>       }
>diff --git a/telepathy-glib/call-content-media-description.c b/telepathy-glib/call-content-media-description.c
>index bd6b205..8a144af 100644
>--- a/telepathy-glib/call-content-media-description.c
>+++ b/telepathy-glib/call-content-media-description.c
>@@ -72,15 +72,15 @@ static void call_content_media_description_extra_iface_init (gpointer iface,
> G_DEFINE_TYPE_WITH_CODE(TpCallContentMediaDescription,
>     tp_call_content_media_description,
>     G_TYPE_OBJECT,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION,
>         call_content_media_description_iface_init);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>         tp_dbus_properties_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1,
>         call_content_media_description_extra_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1,
>         call_content_media_description_extra_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1,
>         call_content_media_description_extra_iface_init);
>   );
> 
>@@ -335,22 +335,22 @@ tp_call_content_media_description_class_init (
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION,
>+      { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         media_description_props,
>       },
>-      { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS,
>+      { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         rtp_header_extensions_props,
>       },
>-      { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK,
>+      { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         rtcp_feedback_props,
>       },
>-      { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS,
>+      { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         rtcp_extended_reports_props,
>@@ -830,7 +830,7 @@ tp_call_content_media_description_add_rtp_header_extensions_interface (
>     TpCallContentMediaDescription *self)
> {
>   add_interface (self,
>-      TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS);
>+      TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1);
> }
> 
> 
>@@ -848,7 +848,7 @@ tp_call_content_media_description_add_rtcp_feedback_interface (
>     TpCallContentMediaDescription *self)
> {
>   add_interface (self,
>-      TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK);
>+      TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1);
> }
> 
> 
>@@ -866,7 +866,7 @@ tp_call_content_media_description_add_rtcp_extended_reports_interface (
>     TpCallContentMediaDescription *self)
> {
>   add_interface (self,
>-      TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS);
>+      TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1);
> }
> 
> 
>@@ -1167,23 +1167,23 @@ _tp_call_content_media_description_dup_properties (
>   g_return_val_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self), NULL);
> 
>   return tp_asv_new (
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACES,
>           G_TYPE_STRV, self->priv->interfaces->pdata,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED,
>           G_TYPE_BOOLEAN, self->priv->further_negotiation_required,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION,
>           G_TYPE_BOOLEAN, self->priv->has_remote_information,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>           TP_ARRAY_TYPE_CODEC_LIST, self->priv->codecs,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
>           G_TYPE_UINT, self->priv->remote_contact,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_SSRCS,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_SSRCS,
>           TP_HASH_TYPE_CONTACT_SSRCS_MAP, self->priv->ssrcs,
>       NULL);
> }
> 
> static void
>-tp_call_content_media_description_accept (TpSvcCallContentMediaDescription *iface,
>+tp_call_content_media_description_accept (TpSvcCall1ContentMediaDescription *iface,
>     GHashTable *properties,
>     DBusGMethodInvocation *context)
> {
>@@ -1202,7 +1202,7 @@ tp_call_content_media_description_accept (TpSvcCallContentMediaDescription *ifac
>     }
> 
>   codecs = tp_asv_get_boxed (properties,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>       TP_ARRAY_TYPE_CODEC_LIST);
>   if (!codecs || codecs->len == 0)
>     {
>@@ -1213,7 +1213,7 @@ tp_call_content_media_description_accept (TpSvcCallContentMediaDescription *ifac
>     }
> 
>   remote_contact = tp_asv_get_uint32 (properties,
>-      TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
>+      TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT,
>       &valid);
>   if (valid && remote_contact != self->priv->remote_contact)
>     {
>@@ -1228,13 +1228,13 @@ tp_call_content_media_description_accept (TpSvcCallContentMediaDescription *ifac
>   g_simple_async_result_complete (self->priv->result);
>   g_clear_object (&self->priv->result);
> 
>-  tp_svc_call_content_media_description_return_from_accept (context);
>+  tp_svc_call1_content_media_description_return_from_accept (context);
> 
>   tp_dbus_daemon_unregister_object (self->priv->dbus_daemon, G_OBJECT (self));
> }
> 
> static void
>-tp_call_content_media_description_reject (TpSvcCallContentMediaDescription *iface,
>+tp_call_content_media_description_reject (TpSvcCall1ContentMediaDescription *iface,
>     const GValueArray *reason_array,
>     DBusGMethodInvocation *context)
> {
>@@ -1264,7 +1264,7 @@ tp_call_content_media_description_reject (TpSvcCallContentMediaDescription *ifac
>   g_simple_async_result_complete (self->priv->result);
>   g_clear_object (&self->priv->result);
> 
>-  tp_svc_call_content_media_description_return_from_reject (context);
>+  tp_svc_call1_content_media_description_return_from_reject (context);
> 
>   tp_dbus_daemon_unregister_object (self->priv->dbus_daemon, G_OBJECT (self));
> }
>@@ -1272,10 +1272,9 @@ tp_call_content_media_description_reject (TpSvcCallContentMediaDescription *ifac
> static void
> call_content_media_description_iface_init (gpointer iface, gpointer data)
> {
>-  TpSvcCallContentMediaDescriptionClass *klass =
>-      (TpSvcCallContentMediaDescriptionClass *) iface;
>+  TpSvcCall1ContentMediaDescriptionClass *klass = iface;
> 
>-#define IMPLEMENT(x) tp_svc_call_content_media_description_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_call1_content_media_description_implement_##x (\
>     klass, tp_call_content_media_description_##x)
>   IMPLEMENT(accept);
>   IMPLEMENT(reject);
>diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
>index 3ae3a06..fe56992 100644
>--- a/telepathy-glib/call-content.c
>+++ b/telepathy-glib/call-content.c
>@@ -254,9 +254,9 @@ got_all_properties_cb (TpProxy *proxy,
>     }
> 
>   if (tp_proxy_has_interface_by_id (self,
>-          TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF))
>+          TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_DTMF1))
>     {
>-      tp_cli_call_content_interface_dtmf_connect_to_stopped_tones (self,
>+      tp_cli_call1_content_interface_dtmf1_connect_to_stopped_tones (self,
>           tones_stopped_cb, NULL, NULL, NULL, NULL);
>     }
> 
>@@ -327,7 +327,7 @@ send_tones_cancelled_idle_cb (gpointer user_data)
>    * turn in the queue to preserve order. */
>   if (self->priv->current_tones == data)
>     {
>-      tp_cli_call_content_interface_dtmf_call_stop_tone (self, -1,
>+      tp_cli_call1_content_interface_dtmf1_call_stop_tone (self, -1,
>           NULL, NULL, NULL, NULL);
>     }
> 
>@@ -411,7 +411,7 @@ maybe_send_tones (TpCallContent *self)
>     }
> 
>   DEBUG ("Emitting multiple tones: %s", self->priv->current_tones->tones);
>-  tp_cli_call_content_interface_dtmf_call_multiple_tones (self, -1,
>+  tp_cli_call1_content_interface_dtmf1_call_multiple_tones (self, -1,
>       self->priv->current_tones->tones, multiple_tones_cb, NULL, NULL, NULL);
> }
> 
>@@ -423,13 +423,13 @@ tp_call_content_constructed (GObject *obj)
>   ((GObjectClass *) tp_call_content_parent_class)->constructed (obj);
> 
>   /* Connect signals for mutable properties */
>-  tp_cli_call_content_connect_to_streams_added (self,
>+  tp_cli_call1_content_connect_to_streams_added (self,
>       streams_added_cb, NULL, NULL, G_OBJECT (self), NULL);
>-  tp_cli_call_content_connect_to_streams_removed (self,
>+  tp_cli_call1_content_connect_to_streams_removed (self,
>       streams_removed_cb, NULL, NULL, G_OBJECT (self), NULL);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CALL_CONTENT,
>+      TP_IFACE_CALL1_CONTENT,
>       got_all_properties_cb, NULL, NULL, G_OBJECT (self));
> }
> 
>@@ -553,7 +553,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
>   gobject_class->finalize = tp_call_content_finalize;
> 
>   proxy_class->list_features = tp_call_content_list_features;
>-  proxy_class->interface = TP_IFACE_QUARK_CALL_CONTENT;
>+  proxy_class->interface = TP_IFACE_QUARK_CALL1_CONTENT;
> 
>   g_type_class_add_private (gobject_class, sizeof (TpCallContentPrivate));
>   tp_call_content_init_known_interfaces ();
>@@ -878,7 +878,7 @@ tp_call_content_remove_async (TpCallContent *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_content_remove_async);
> 
>-  tp_cli_call_content_call_remove (self, -1,
>+  tp_cli_call1_content_call_remove (self, -1,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -928,7 +928,7 @@ tp_call_content_send_tones_async (TpCallContent *self,
>   g_return_if_fail (TP_IS_CALL_CONTENT (self));
> 
>   if (!tp_proxy_has_interface_by_id (self,
>-          TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF))
>+          TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_DTMF1))
>     {
>       g_simple_async_report_error_in_idle (G_OBJECT (self),
>           callback, user_data, TP_ERROR, TP_ERROR_NOT_CAPABLE,
>diff --git a/telepathy-glib/call-stream-endpoint.c b/telepathy-glib/call-stream-endpoint.c
>index b624601..bdd1e53 100644
>--- a/telepathy-glib/call-stream-endpoint.c
>+++ b/telepathy-glib/call-stream-endpoint.c
>@@ -21,10 +21,10 @@
> /**
>  * SECTION:call-stream-endpoint
>  * @title: TpCallStreamEndpoint
>- * @short_description: class for #TpSvcCallStreamEndpoint implementations
>+ * @short_description: class for #TpSvcCall1StreamEndpoint implementations
>  * @see_also: #TpBaseMediaCallStream
>  *
>- * This class makes it easier to write #TpSvcCallStreamEndpoint
>+ * This class makes it easier to write #TpSvcCall1StreamEndpoint
>  * implementations by implementing its properties and methods.
>  *
>  * Since: 0.17.5
>@@ -73,7 +73,7 @@ static void call_stream_endpoint_iface_init (gpointer, gpointer);
> G_DEFINE_TYPE_WITH_CODE(TpCallStreamEndpoint,
>   tp_call_stream_endpoint,
>   G_TYPE_OBJECT,
>-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_STREAM_ENDPOINT,
>+  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL1_STREAM_ENDPOINT,
>       call_stream_endpoint_iface_init);
>    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>       tp_dbus_properties_mixin_iface_init);
>@@ -279,7 +279,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_CALL_STREAM_ENDPOINT,
>+      { TP_IFACE_CALL1_STREAM_ENDPOINT,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         endpoint_props,
>@@ -589,7 +589,7 @@ tp_call_stream_endpoint_add_new_candidates (TpCallStreamEndpoint *self,
>       G_GNUC_END_IGNORE_DEPRECATIONS
>     }
> 
>-  tp_svc_call_stream_endpoint_emit_remote_candidates_added (self,
>+  tp_svc_call1_stream_endpoint_emit_remote_candidates_added (self,
>       candidates);
> }
> 
>@@ -634,7 +634,7 @@ tp_call_stream_endpoint_add_new_candidate (TpCallStreamEndpoint *self,
> 
>   candidates = g_ptr_array_new ();
>   g_ptr_array_add (candidates, c);
>-  tp_svc_call_stream_endpoint_emit_remote_candidates_added (self,
>+  tp_svc_call1_stream_endpoint_emit_remote_candidates_added (self,
>       candidates);
>   g_ptr_array_unref (candidates);
> }
>@@ -666,7 +666,7 @@ tp_call_stream_endpoint_set_remote_credentials (TpCallStreamEndpoint *self,
>   self->priv->username = g_strdup (username);
>   self->priv->password = g_strdup (password);
> 
>-  tp_svc_call_stream_endpoint_emit_remote_credentials_set (self, username,
>+  tp_svc_call1_stream_endpoint_emit_remote_credentials_set (self, username,
>       password);
> }
> 
>@@ -761,7 +761,7 @@ common_checks (TpCallStreamEndpoint *self,
> }
> 
> static void
>-call_stream_endpoint_set_selected_candidate_pair (TpSvcCallStreamEndpoint *iface,
>+call_stream_endpoint_set_selected_candidate_pair (TpSvcCall1StreamEndpoint *iface,
>     const GValueArray *local_candidate,
>     const GValueArray *remote_candidate,
>     DBusGMethodInvocation *context)
>@@ -809,17 +809,17 @@ call_stream_endpoint_set_selected_candidate_pair (TpSvcCallStreamEndpoint *iface
>       G_TYPE_INVALID);
>   g_ptr_array_add (self->priv->selected_candidate_pairs, pair);
> 
>-  tp_svc_call_stream_endpoint_emit_candidate_pair_selected (self,
>+  tp_svc_call1_stream_endpoint_emit_candidate_pair_selected (self,
>       local_candidate, remote_candidate);
> 
>   g_signal_emit (self, _signals[CANDIDATE_SELECTED], 0,
>       local_candidate, remote_candidate);
> 
>-  tp_svc_call_stream_endpoint_return_from_set_selected_candidate_pair (context);
>+  tp_svc_call1_stream_endpoint_return_from_set_selected_candidate_pair (context);
> }
> 
> static void
>-call_stream_endpoint_set_endpoint_state (TpSvcCallStreamEndpoint *iface,
>+call_stream_endpoint_set_endpoint_state (TpSvcCall1StreamEndpoint *iface,
>     TpStreamComponent component,
>     TpStreamEndpointState state,
>     DBusGMethodInvocation *context)
>@@ -852,7 +852,7 @@ call_stream_endpoint_set_endpoint_state (TpSvcCallStreamEndpoint *iface,
>       GUINT_TO_POINTER (state));
>   g_object_notify (G_OBJECT (self), "endpoint-state");
> 
>-  tp_svc_call_stream_endpoint_emit_endpoint_state_changed (self,
>+  tp_svc_call1_stream_endpoint_emit_endpoint_state_changed (self,
>       component, state);
> 
>   if (component == TP_STREAM_COMPONENT_DATA)
>@@ -865,12 +865,12 @@ call_stream_endpoint_set_endpoint_state (TpSvcCallStreamEndpoint *iface,
>             TP_BASE_MEDIA_CALL_CHANNEL (chan));
>     }
> 
>-  tp_svc_call_stream_endpoint_return_from_set_endpoint_state (context);
>+  tp_svc_call1_stream_endpoint_return_from_set_endpoint_state (context);
> }
> 
> static void
> call_stream_endpoint_accept_selected_candidate_pair (
>-    TpSvcCallStreamEndpoint *iface,
>+    TpSvcCall1StreamEndpoint *iface,
>     const GValueArray *local_candidate,
>     const GValueArray *remote_candidate,
>     DBusGMethodInvocation *context)
>@@ -891,13 +891,13 @@ call_stream_endpoint_accept_selected_candidate_pair (
>   g_signal_emit (self, _signals[CANDIDATE_ACCEPTED], 0,
>       local_candidate, remote_candidate);
> 
>-  tp_svc_call_stream_endpoint_return_from_accept_selected_candidate_pair (
>+  tp_svc_call1_stream_endpoint_return_from_accept_selected_candidate_pair (
>       context);
> }
> 
> static void
> call_stream_endpoint_reject_selected_candidate_pair (
>-    TpSvcCallStreamEndpoint *iface,
>+    TpSvcCall1StreamEndpoint *iface,
>     const GValueArray *local_candidate,
>     const GValueArray *remote_candidate,
>     DBusGMethodInvocation *context)
>@@ -918,12 +918,12 @@ call_stream_endpoint_reject_selected_candidate_pair (
>   g_signal_emit (self, _signals[CANDIDATE_REJECTED], 0,
>       local_candidate, remote_candidate);
> 
>-  tp_svc_call_stream_endpoint_return_from_reject_selected_candidate_pair (
>+  tp_svc_call1_stream_endpoint_return_from_reject_selected_candidate_pair (
>       context);
> }
> 
> static void
>-call_stream_endpoint_set_controlling (TpSvcCallStreamEndpoint *iface,
>+call_stream_endpoint_set_controlling (TpSvcCall1StreamEndpoint *iface,
>     gboolean controlling,
>     DBusGMethodInvocation *context)
> {
>@@ -931,17 +931,17 @@ call_stream_endpoint_set_controlling (TpSvcCallStreamEndpoint *iface,
> 
>   self->priv->controlling = controlling;
> 
>-  tp_svc_call_stream_endpoint_emit_controlling_changed (self, controlling);
>-  tp_svc_call_stream_endpoint_return_from_set_controlling (context);
>+  tp_svc_call1_stream_endpoint_emit_controlling_changed (self, controlling);
>+  tp_svc_call1_stream_endpoint_return_from_set_controlling (context);
> }
> 
> static void
> call_stream_endpoint_iface_init (gpointer iface, gpointer data)
> {
>-  TpSvcCallStreamEndpointClass *klass =
>-    (TpSvcCallStreamEndpointClass *) iface;
>+  TpSvcCall1StreamEndpointClass *klass =
>+    (TpSvcCall1StreamEndpointClass *) iface;
> 
>-#define IMPLEMENT(x) tp_svc_call_stream_endpoint_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_call1_stream_endpoint_implement_##x (\
>     klass, call_stream_endpoint_##x)
>   IMPLEMENT(set_selected_candidate_pair);
>   IMPLEMENT(set_endpoint_state);
>diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c
>index 749e830..96c0272 100644
>--- a/telepathy-glib/call-stream.c
>+++ b/telepathy-glib/call-stream.c
>@@ -229,13 +229,13 @@ tp_call_stream_constructed (GObject *obj)
>   ((GObjectClass *) tp_call_stream_parent_class)->constructed (obj);
> 
>   /* Connect signals for mutable properties */
>-  tp_cli_call_stream_connect_to_remote_members_changed (self,
>+  tp_cli_call1_stream_connect_to_remote_members_changed (self,
>       remote_members_changed_cb, NULL, NULL, G_OBJECT (self), NULL);
>-  tp_cli_call_stream_connect_to_local_sending_state_changed (self,
>+  tp_cli_call1_stream_connect_to_local_sending_state_changed (self,
>       local_sending_state_changed_cb, NULL, NULL, G_OBJECT (self), NULL);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CALL_STREAM,
>+      TP_IFACE_CALL1_STREAM,
>       got_all_properties_cb, NULL, NULL, G_OBJECT (self));
> }
> 
>@@ -340,7 +340,7 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
>   gobject_class->dispose = tp_call_stream_dispose;
> 
>   proxy_class->list_features = tp_call_stream_list_features;
>-  proxy_class->interface = TP_IFACE_QUARK_CALL_STREAM;
>+  proxy_class->interface = TP_IFACE_QUARK_CALL1_STREAM;
> 
>   g_type_class_add_private (gobject_class, sizeof (TpCallStreamPrivate));
>   tp_call_stream_init_known_interfaces ();
>@@ -605,7 +605,7 @@ tp_call_stream_set_sending_async (TpCallStream *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_stream_set_sending_async);
> 
>-  tp_cli_call_stream_call_set_sending (self, -1, send,
>+  tp_cli_call1_stream_call_set_sending (self, -1, send,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -662,7 +662,7 @@ tp_call_stream_request_receiving_async (TpCallStream *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_call_stream_set_sending_async);
> 
>-  tp_cli_call_stream_call_request_receiving (self, -1,
>+  tp_cli_call1_stream_call_request_receiving (self, -1,
>       tp_contact_get_handle (contact), receive,
>       generic_async_cb, result, g_object_unref, G_OBJECT (self));
> }
>diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c
>index d4557b4..b002866 100644
>--- a/telepathy-glib/capabilities.c
>+++ b/telepathy-glib/capabilities.c
>@@ -461,7 +461,7 @@ tp_capabilities_supports_sms (TpCapabilities *self)
>         continue;
> 
>       /* SMSChannel be either in fixed or allowed properties */
>-      if (tp_asv_get_boolean (fixed, TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL,
>+      if (tp_asv_get_boolean (fixed, TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL,
>             NULL))
>         {
>           /* In fixed, succeed if there is no more fixed properties required */
>@@ -471,7 +471,7 @@ tp_capabilities_supports_sms (TpCapabilities *self)
>         {
>           /* Not in fixed; check allowed */
>           if (!tp_strv_contains (allowed,
>-                TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL))
>+                TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL))
>             continue;
> 
>           nb_fixed_props = 2;
>@@ -510,7 +510,7 @@ supports_call_full (TpCapabilities *self,
>           &allowed_prop);
> 
>       chan_type = tp_asv_get_string (fixed_prop, TP_PROP_CHANNEL_CHANNEL_TYPE);
>-      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL))
>+      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL1))
>         continue;
> 
>       handle_type = tp_asv_get_uint32 (fixed_prop,
>@@ -522,12 +522,12 @@ supports_call_full (TpCapabilities *self,
>         {
>           /* We want audio, INITIAL_AUDIO must be in either fixed or allowed */
>           if (tp_asv_get_boolean (fixed_prop,
>-                  TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL))
>+                  TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL))
>             {
>               nb_fixed_props++;
>             }
>           else if (!tp_strv_contains (allowed_prop,
>-                  TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO))
>+                  TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO))
>             {
>               continue;
>             }
>@@ -537,12 +537,12 @@ supports_call_full (TpCapabilities *self,
>         {
>           /* We want video, INITIAL_VIDEO must be in either fixed or allowed */
>           if (tp_asv_get_boolean (fixed_prop,
>-                  TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL))
>+                  TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL))
>             {
>               nb_fixed_props++;
>             }
>           else if (!tp_strv_contains (allowed_prop,
>-                  TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO))
>+                  TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO))
>             {
>               continue;
>             }
>@@ -644,7 +644,7 @@ supports_file_transfer (TpCapabilities *self,
> 
>       chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
> 
>-      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
>+      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1))
>         continue;
> 
>       handle_type = tp_asv_get_uint32 (fixed,
>@@ -666,7 +666,7 @@ supports_file_transfer (TpCapabilities *self,
>           /* Description makes no sense as a fixed property so we assume
>            * the CM won't be ridiculous */
>           if (!tp_strv_contains (allowed,
>-                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION))
>+                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION))
>             continue;
>         }
> 
>@@ -674,7 +674,7 @@ supports_file_transfer (TpCapabilities *self,
>         {
>           /* makes no sense as a fixed property */
>           if (!tp_strv_contains (allowed,
>-                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE))
>+                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE))
>             continue;
>         }
> 
>@@ -682,7 +682,7 @@ supports_file_transfer (TpCapabilities *self,
>         {
>           /* makes no sense as a fixed property */
>           if (!tp_strv_contains (allowed,
>-                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI))
>+                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI))
>             continue;
>         }
> 
>@@ -690,7 +690,7 @@ supports_file_transfer (TpCapabilities *self,
>         {
>           /* makes no sense as a fixed property */
>           if (!tp_strv_contains (allowed,
>-                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET))
>+                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET))
>             continue;
>         }
> 
>@@ -877,8 +877,8 @@ tp_capabilities_supports_stream_tubes (TpCapabilities *self,
>     const gchar *service)
> {
>   return tp_capabilities_supports_tubes_common (self,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, handle_type,
>-      TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE, service);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1, handle_type,
>+      TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE, service);
> }
> 
> /**
>@@ -910,8 +910,8 @@ tp_capabilities_supports_dbus_tubes (TpCapabilities *self,
>     const gchar *service_name)
> {
>   return tp_capabilities_supports_tubes_common (self,
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, handle_type,
>-      TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME, service_name);
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1, handle_type,
>+      TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME, service_name);
> }
> 
> /**
>@@ -965,7 +965,7 @@ tp_capabilities_supports_contact_search (TpCapabilities *self,
>         continue;
> 
>       chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
>-      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH))
>+      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1))
>         continue;
> 
>       ret = TRUE;
>@@ -975,14 +975,14 @@ tp_capabilities_supports_contact_search (TpCapabilities *self,
>           if (with_limit)
>             {
>               if (!tp_strdiff (allowed_properties[j],
>-                       TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT))
>+                       TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_LIMIT))
>                 *with_limit = TRUE;
>             }
> 
>           if (with_server)
>             {
>               if (!tp_strdiff (allowed_properties[j],
>-                       TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER))
>+                       TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_SERVER))
>                 *with_server = TRUE;
>             }
>         }
>@@ -1063,7 +1063,7 @@ tp_capabilities_supports_room_list (TpCapabilities *self,
>         continue;
> 
>       chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
>-      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_ROOM_LIST))
>+      if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_ROOM_LIST1))
>         continue;
> 
>       handle_type = tp_asv_get_uint32 (fixed,
>@@ -1074,7 +1074,7 @@ tp_capabilities_supports_room_list (TpCapabilities *self,
>       result = TRUE;
> 
>       server = tp_strv_contains (allowed_properties,
>-          TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER);
>+          TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER);
>       break;
>     }
> 
>diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
>index 7bdac4b..69c47b3 100644
>--- a/telepathy-glib/channel-group.c
>+++ b/telepathy-glib/channel-group.c
>@@ -991,7 +991,7 @@ _tp_channel_group_prepare_async (TpProxy *proxy,
>   GError *error = NULL;
> 
>   if (!tp_proxy_has_interface_by_id (self,
>-        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
>+        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1))
>     {
>       g_simple_async_report_error_in_idle ((GObject *) self, callback,
>           user_data, TP_ERROR, TP_ERROR_NOT_CAPABLE,
>@@ -999,19 +999,19 @@ _tp_channel_group_prepare_async (TpProxy *proxy,
>       return;
>     }
> 
>-  tp_cli_channel_interface_group_connect_to_group_flags_changed (self,
>+  tp_cli_channel_interface_group1_connect_to_group_flags_changed (self,
>       group_flags_changed_cb, NULL, NULL, NULL, &error);
>   g_assert_no_error (error);
> 
>-  tp_cli_channel_interface_group_connect_to_self_contact_changed (self,
>+  tp_cli_channel_interface_group1_connect_to_self_contact_changed (self,
>       self_contact_changed_cb, NULL, NULL, NULL, &error);
>   g_assert_no_error (error);
> 
>-  tp_cli_channel_interface_group_connect_to_members_changed (self,
>+  tp_cli_channel_interface_group1_connect_to_members_changed (self,
>       members_changed_cb, NULL, NULL, NULL, &error);
>   g_assert_no_error (error);
> 
>-  tp_cli_channel_interface_group_connect_to_handle_owners_changed (self,
>+  tp_cli_channel_interface_group1_connect_to_handle_owners_changed (self,
>       handle_owners_changed_cb, NULL, NULL, NULL, &error);
>   g_assert_no_error (error);
> 
>@@ -1019,7 +1019,7 @@ _tp_channel_group_prepare_async (TpProxy *proxy,
>       _tp_channel_group_prepare_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CHANNEL_INTERFACE_GROUP, got_group_properties_cb,
>+      TP_IFACE_CHANNEL_INTERFACE_GROUP1, got_group_properties_cb,
>       result, g_object_unref, NULL);
> }
> 
>diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
>index dbd8025..52c21d1 100644
>--- a/telepathy-glib/channel.c
>+++ b/telepathy-glib/channel.c
>@@ -1087,10 +1087,10 @@ tp_channel_prepare_password_async (TpProxy *proxy,
>   result = g_simple_async_result_new ((GObject *) proxy, callback, user_data,
>       tp_channel_prepare_password_async);
> 
>-  tp_cli_channel_interface_password_connect_to_password_flags_changed (self,
>+  tp_cli_channel_interface_password1_connect_to_password_flags_changed (self,
>       password_flags_changed_cb, self, NULL, G_OBJECT (self), NULL);
> 
>-  tp_cli_channel_interface_password_call_get_password_flags (self, -1,
>+  tp_cli_channel_interface_password1_call_get_password_flags (self, -1,
>       got_password_flags_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>@@ -1121,7 +1121,7 @@ tp_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
>   features[FEAT_PASSWORD].name = TP_CHANNEL_FEATURE_PASSWORD;
>   features[FEAT_PASSWORD].prepare_async =
>     tp_channel_prepare_password_async;
>-  need_password[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD;
>+  need_password[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD1;
>   features[FEAT_PASSWORD].interfaces_needed = need_password;
> 
>   /* assert that the terminator at the end is there */
>@@ -1559,7 +1559,7 @@ tp_channel_join_async (TpChannel *self,
>   self_handle = tp_contact_get_handle (self->priv->group_self_contact);
>   g_array_append_val (array, self_handle);
> 
>-  tp_cli_channel_interface_group_call_add_members (self, -1, array, message,
>+  tp_cli_channel_interface_group1_call_add_members (self, -1, array, message,
>       channel_join_cb, result, g_object_unref, NULL);
> 
>   g_array_unref (array);
>@@ -1683,7 +1683,7 @@ tp_channel_leave_async (TpChannel *self,
>   self_handle = tp_contact_get_handle (self->priv->group_self_contact);
>   g_array_append_val (handles, self_handle);
> 
>-  tp_cli_channel_interface_group_call_remove_members (
>+  tp_cli_channel_interface_group1_call_remove_members (
>       self, -1, handles, message, reason,
>       channel_remove_self_cb, result, NULL, NULL);
> 
>@@ -1819,7 +1819,7 @@ tp_channel_destroy_async (TpChannel *self,
> 
>   if (tp_proxy_is_prepared (self, TP_CHANNEL_FEATURE_CORE) &&
>       !tp_proxy_has_interface_by_id (self,
>-        TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE))
>+        TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE1))
>     {
>       DEBUG ("Channel doesn't implement Destroy; fallback to Close()");
> 
>@@ -1828,7 +1828,7 @@ tp_channel_destroy_async (TpChannel *self,
>       return;
>     }
> 
>-  tp_cli_channel_interface_destroyable_call_destroy (self, -1,
>+  tp_cli_channel_interface_destroyable1_call_destroy (self, -1,
>       channel_destroy_cb, result, NULL, NULL);
> }
> 
>@@ -1944,7 +1944,7 @@ tp_channel_provide_password_async (TpChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_channel_provide_password_async);
> 
>-  tp_cli_channel_interface_password_call_provide_password (self, -1, password,
>+  tp_cli_channel_interface_password1_call_provide_password (self, -1, password,
>       provide_password_cb, result, g_object_unref, G_OBJECT (self));
> }
> 
>diff --git a/telepathy-glib/connection-aliasing.c b/telepathy-glib/connection-aliasing.c
>index c65b616..5d56442 100644
>--- a/telepathy-glib/connection-aliasing.c
>+++ b/telepathy-glib/connection-aliasing.c
>@@ -119,6 +119,6 @@ _tp_connection_prepare_aliasing_async (TpProxy *proxy,
>       _tp_connection_prepare_aliasing_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>       get_all_cb, result, g_object_unref, G_OBJECT (self));
> }
>diff --git a/telepathy-glib/connection-avatars.c b/telepathy-glib/connection-avatars.c
>index 80b1a5a..f2ca3f2 100644
>--- a/telepathy-glib/connection-avatars.c
>+++ b/telepathy-glib/connection-avatars.c
>@@ -104,7 +104,7 @@ _tp_connection_prepare_avatar_requirements_async (TpProxy *proxy,
>       _tp_connection_prepare_avatar_requirements_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>       tp_connection_get_avatar_requirements_cb, result, g_object_unref, NULL);
> }
> 
>diff --git a/telepathy-glib/connection-contact-info.c b/telepathy-glib/connection-contact-info.c
>index 948178c..c291a4f 100644
>--- a/telepathy-glib/connection-contact-info.c
>+++ b/telepathy-glib/connection-contact-info.c
>@@ -432,7 +432,7 @@ _tp_connection_prepare_contact_info_async (TpProxy *proxy,
>       _tp_connection_prepare_contact_info_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>       tp_connection_get_contact_info_cb, result, g_object_unref, NULL);
> }
> 
>@@ -549,7 +549,7 @@ tp_connection_set_contact_info_async (TpConnection *self,
>       info = info->next;
>     }
> 
>-  tp_cli_connection_interface_contact_info_call_set_contact_info (self, -1,
>+  tp_cli_connection_interface_contact_info1_call_set_contact_info (self, -1,
>       contact_info, set_info_cb, result, g_object_unref, NULL);
> 
>   g_ptr_array_foreach (contact_info, (GFunc) tp_value_array_free, NULL);
>diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c
>index f7da02c..6b45542 100644
>--- a/telepathy-glib/connection-contact-list.c
>+++ b/telepathy-glib/connection-contact-list.c
>@@ -302,7 +302,7 @@ prepare_roster (TpConnection *self,
>   DEBUG ("CM has the roster for connection %s, fetch it now.",
>       tp_proxy_get_object_path (self));
> 
>-  tp_cli_connection_interface_contact_list_connect_to_contacts_changed (
>+  tp_cli_connection_interface_contact_list1_connect_to_contacts_changed (
>       self, contacts_changed_cb, NULL, NULL, NULL, NULL);
> 
>   features = tp_client_factory_dup_contact_features (
>@@ -315,7 +315,7 @@ prepare_roster (TpConnection *self,
>   supported_interfaces = _tp_contacts_bind_to_signals (self,
>       (const GQuark *) features->data);
> 
>-  tp_cli_connection_interface_contact_list_call_get_contact_list_attributes (
>+  tp_cli_connection_interface_contact_list1_call_get_contact_list_attributes (
>       self, -1, supported_interfaces,
>       got_contact_list_attributes_cb,
>       features, (GDestroyNotify) g_array_unref,
>@@ -446,14 +446,14 @@ _tp_connection_prepare_contact_list_props_async (TpProxy *proxy,
>   TpConnection *self = (TpConnection *) proxy;
>   GSimpleAsyncResult *result;
> 
>-  tp_cli_connection_interface_contact_list_connect_to_contact_list_state_changed
>+  tp_cli_connection_interface_contact_list1_connect_to_contact_list_state_changed
>       (self, contact_list_state_changed_cb, NULL, NULL, NULL, NULL);
> 
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       _tp_connection_prepare_contact_list_props_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
>       prepare_contact_list_props_cb, result, g_object_unref, NULL);
> }
> 
>@@ -631,18 +631,18 @@ _tp_connection_prepare_contact_groups_async (TpProxy *proxy,
>   TpConnection *self = (TpConnection *) proxy;
>   GSimpleAsyncResult *result;
> 
>-  tp_cli_connection_interface_contact_groups_connect_to_groups_created (
>+  tp_cli_connection_interface_contact_groups1_connect_to_groups_created (
>       self, contact_groups_created_cb, NULL, NULL, NULL, NULL);
>-  tp_cli_connection_interface_contact_groups_connect_to_groups_removed (
>+  tp_cli_connection_interface_contact_groups1_connect_to_groups_removed (
>       self, contact_groups_removed_cb, NULL, NULL, NULL, NULL);
>-  tp_cli_connection_interface_contact_groups_connect_to_group_renamed (
>+  tp_cli_connection_interface_contact_groups1_connect_to_group_renamed (
>       self, contact_group_renamed_cb, NULL, NULL, NULL, NULL);
> 
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       _tp_connection_prepare_contact_groups_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>       prepare_contact_groups_cb, result, g_object_unref, NULL);
> }
> 
>@@ -810,7 +810,7 @@ generic_callback (TpConnection *self,
>     result = g_simple_async_result_new ((GObject *) self, callback, user_data, \
>         tp_connection_##method##_async); \
>     \
>-    tp_cli_connection_interface_contact_list_call_##method (self, -1, handles, \
>+    tp_cli_connection_interface_contact_list1_call_##method (self, -1, handles, \
>         ##__VA_ARGS__, generic_callback, result, g_object_unref, NULL); \
>     g_array_unref (handles); \
>   } G_STMT_END
>@@ -834,7 +834,7 @@ generic_callback (TpConnection *self,
>  * %TP_SUBSCRIPTION_STATE_YES.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1.
>  *
>  * Since: 0.15.5
>  */
>@@ -883,7 +883,7 @@ tp_connection_request_subscription_finish (TpConnection *self,
>  * becomes %TP_SUBSCRIPTION_STATE_YES.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1.
>  *
>  * Since: 0.15.5
>  */
>@@ -930,7 +930,7 @@ tp_connection_authorize_publication_finish (TpConnection *self,
>  * protocol-dependent whether this works, and under which circumstances.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1.
>  *
>  * Since: 0.15.5
>  */
>@@ -977,7 +977,7 @@ tp_connection_remove_contacts_finish (TpConnection *self,
>  * %TP_SUBSCRIPTION_STATE_NO, i.e. stop receiving their presence.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1024,7 +1024,7 @@ tp_connection_unsubscribe_finish (TpConnection *self,
>  * %TP_SUBSCRIPTION_STATE_NO, i.e. stop sending presence to them.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1155,7 +1155,7 @@ tp_connection_get_contact_groups (TpConnection *self)
>     result = g_simple_async_result_new ((GObject *) self, callback, user_data, \
>         tp_connection_##method##_async); \
>     \
>-    tp_cli_connection_interface_contact_groups_call_##method (self, -1, \
>+    tp_cli_connection_interface_contact_groups1_call_##method (self, -1, \
>         group, handles, generic_callback, result, g_object_unref, NULL); \
>     g_array_unref (handles); \
>   } G_STMT_END
>@@ -1174,7 +1174,7 @@ tp_connection_get_contact_groups (TpConnection *self)
>  * remove all other members.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1222,7 +1222,7 @@ tp_connection_set_group_members_finish (TpConnection *self,
>  * Add the given @contacts to the given @group, creating it if necessary.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1271,7 +1271,7 @@ tp_connection_add_to_group_finish (TpConnection *self,
>  * left in the group afterwards, the group MAY itself be removed.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1316,7 +1316,7 @@ tp_connection_remove_from_group_finish (TpConnection *self,
>  * Remove all members from the given group, then remove the group itself.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1334,7 +1334,7 @@ tp_connection_remove_group_async (TpConnection *self,
>     result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>         tp_connection_remove_group_async);
> 
>-    tp_cli_connection_interface_contact_groups_call_remove_group (self, -1,
>+    tp_cli_connection_interface_contact_groups1_call_remove_group (self, -1,
>         group, generic_callback, result, g_object_unref, NULL);
> }
> 
>@@ -1373,7 +1373,7 @@ tp_connection_remove_group_finish (TpConnection *self,
>  * the old group.
>  *
>  * For this to work properly @self must have interface
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1.
>  *
>  * Since: 0.15.5
>  */
>@@ -1393,7 +1393,7 @@ tp_connection_rename_group_async (TpConnection *self,
>     result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>         tp_connection_rename_group_async);
> 
>-    tp_cli_connection_interface_contact_groups_call_rename_group (self, -1,
>+    tp_cli_connection_interface_contact_groups1_call_rename_group (self, -1,
>         old_name, new_name, generic_callback, result, g_object_unref, NULL);
> }
> 
>@@ -1459,7 +1459,7 @@ tp_connection_block_contacts_async (TpConnection *self,
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       tp_connection_block_contacts_async);
> 
>-  tp_cli_connection_interface_contact_blocking_call_block_contacts (self, -1,
>+  tp_cli_connection_interface_contact_blocking1_call_block_contacts (self, -1,
>       handles, report_abusive, generic_callback, result, g_object_unref, NULL);
>   g_array_unref (handles);
> }
>@@ -1518,7 +1518,7 @@ tp_connection_unblock_contacts_async (TpConnection *self,
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       tp_connection_unblock_contacts_async);
> 
>-  tp_cli_connection_interface_contact_blocking_call_unblock_contacts (self, -1,
>+  tp_cli_connection_interface_contact_blocking1_call_unblock_contacts (self, -1,
>       handles, generic_callback, result, g_object_unref, NULL);
>   g_array_unref (handles);
> }
>@@ -1861,7 +1861,7 @@ prepare_contact_blocking_cb (TpProxy *proxy,
>         }
>     }
> 
>-  tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts (
>+  tp_cli_connection_interface_contact_blocking1_call_request_blocked_contacts (
>       self, -1, request_blocked_contacts_cb, g_object_ref (result),
>       g_object_unref, G_OBJECT (self));
> }
>@@ -1893,10 +1893,10 @@ _tp_connection_prepare_contact_blocking_async (TpProxy *proxy,
>       _tp_connection_prepare_contact_blocking_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
>       prepare_contact_blocking_cb, result, g_object_unref, NULL);
> 
>-  if (tp_cli_connection_interface_contact_blocking_connect_to_blocked_contacts_changed (self,
>+  if (tp_cli_connection_interface_contact_blocking1_connect_to_blocked_contacts_changed (self,
>         blocked_contacts_changed_cb, NULL, NULL, NULL, &error) == NULL)
>     {
>       DEBUG ("Failed to connect to BlockedContactsChanged: %s", error->message);
>diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
>index 62dd787..a63798b 100644
>--- a/telepathy-glib/connection.c
>+++ b/telepathy-glib/connection.c
>@@ -494,10 +494,10 @@ tp_connection_prepare_balance_async (TpProxy *proxy,
>   g_assert (self->priv->balance_currency == NULL);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_BALANCE,
>+      TP_IFACE_CONNECTION_INTERFACE_BALANCE1,
>       tp_connection_get_balance_cb, result, g_object_unref, NULL);
> 
>-  tp_cli_connection_interface_balance_connect_to_balance_changed (self,
>+  tp_cli_connection_interface_balance1_connect_to_balance_changed (self,
>       tp_connection_balance_changed_cb,
>       NULL, NULL, NULL, NULL);
> }
>@@ -1386,23 +1386,23 @@ tp_connection_list_features (TpProxyClass *cls G_GNUC_UNUSED)
>   features[FEAT_AVATAR_REQUIREMENTS].name = TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS;
>   features[FEAT_AVATAR_REQUIREMENTS].prepare_async =
>     _tp_connection_prepare_avatar_requirements_async;
>-  need_avatars[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS;
>+  need_avatars[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1;
>   features[FEAT_AVATAR_REQUIREMENTS].interfaces_needed = need_avatars;
> 
>   features[FEAT_CONTACT_INFO].name = TP_CONNECTION_FEATURE_CONTACT_INFO;
>   features[FEAT_CONTACT_INFO].prepare_async =
>     _tp_connection_prepare_contact_info_async;
>-  need_contact_info[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO;
>+  need_contact_info[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO1;
>   features[FEAT_CONTACT_INFO].interfaces_needed = need_contact_info;
> 
>   features[FEAT_BALANCE].name = TP_CONNECTION_FEATURE_BALANCE;
>   features[FEAT_BALANCE].prepare_async = tp_connection_prepare_balance_async;
>-  need_balance[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE;
>+  need_balance[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE1;
>   features[FEAT_BALANCE].interfaces_needed = need_balance;
> 
>   features[FEAT_CONTACT_LIST].name = TP_CONNECTION_FEATURE_CONTACT_LIST;
>   features[FEAT_CONTACT_LIST].prepare_async = _tp_connection_prepare_contact_list_async;
>-  need_contact_list[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST;
>+  need_contact_list[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST1;
>   need_contact_list[1] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS;
>   features[FEAT_CONTACT_LIST].interfaces_needed = need_contact_list;
>   depends_contact_list[0] = TP_CONNECTION_FEATURE_CONTACT_LIST_PROPERTIES;
>@@ -1414,17 +1414,17 @@ tp_connection_list_features (TpProxyClass *cls G_GNUC_UNUSED)
> 
>   features[FEAT_CONTACT_GROUPS].name = TP_CONNECTION_FEATURE_CONTACT_GROUPS;
>   features[FEAT_CONTACT_GROUPS].prepare_async = _tp_connection_prepare_contact_groups_async;
>-  need_contact_groups[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS;
>+  need_contact_groups[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS1;
>   features[FEAT_CONTACT_GROUPS].interfaces_needed = need_contact_groups;
> 
>   features[FEAT_CONTACT_BLOCKING].name = TP_CONNECTION_FEATURE_CONTACT_BLOCKING;
>   features[FEAT_CONTACT_BLOCKING].prepare_async = _tp_connection_prepare_contact_blocking_async;
>-  need_contact_blocking[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING;
>+  need_contact_blocking[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1;
>   features[FEAT_CONTACT_BLOCKING].interfaces_needed = need_contact_blocking;
> 
>   features[FEAT_ALIASING].name = TP_CONNECTION_FEATURE_ALIASING;
>   features[FEAT_ALIASING].prepare_async = _tp_connection_prepare_aliasing_async;
>-  need_aliasing[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING;
>+  need_aliasing[0] = TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING1;
>   features[FEAT_ALIASING].interfaces_needed = need_aliasing;
> 
>   /* assert that the terminator at the end is there */
>diff --git a/telepathy-glib/contact-operations.c b/telepathy-glib/contact-operations.c
>index 70f917f..5433010 100644
>--- a/telepathy-glib/contact-operations.c
>+++ b/telepathy-glib/contact-operations.c
>@@ -66,7 +66,7 @@ generic_callback (TpConnection *self,
>     result = g_simple_async_result_new ((GObject *) self, callback, user_data, \
>         tp_contact_##method##_async); \
>     \
>-    tp_cli_connection_interface_contact_list_call_##method ( \
>+    tp_cli_connection_interface_contact_list1_call_##method ( \
>         tp_contact_get_connection (self), -1, handles, ##__VA_ARGS__, \
>         generic_callback, result, g_object_unref, NULL); \
>     g_array_unref (handles); \
>@@ -287,7 +287,7 @@ tp_contact_unpublish_finish (TpContact *self,
>     result = g_simple_async_result_new ((GObject *) self, callback, user_data, \
>         tp_contact_##method##_async); \
>     \
>-    tp_cli_connection_interface_contact_groups_call_##method ( \
>+    tp_cli_connection_interface_contact_groups1_call_##method ( \
>         tp_contact_get_connection (self), -1, group, handles, \
>         generic_callback, result, g_object_unref, NULL); \
>     g_array_unref (handles); \
>@@ -413,7 +413,7 @@ tp_contact_block_async (TpContact *self,
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       tp_contact_block_async);
> 
>-  tp_cli_connection_interface_contact_blocking_call_block_contacts (
>+  tp_cli_connection_interface_contact_blocking1_call_block_contacts (
>       tp_contact_get_connection (self), -1,
>       handles, report_abusive, generic_callback, result, g_object_unref, NULL);
> 
>@@ -469,7 +469,7 @@ tp_contact_unblock_async (TpContact *self,
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       tp_contact_unblock_async);
> 
>-  tp_cli_connection_interface_contact_blocking_call_unblock_contacts (
>+  tp_cli_connection_interface_contact_blocking1_call_unblock_contacts (
>       tp_contact_get_connection (self), -1,
>       handles, generic_callback, result, g_object_unref, NULL);
> 
>diff --git a/telepathy-glib/contact-search.c b/telepathy-glib/contact-search.c
>index 6c1fd68..bae89f7 100644
>--- a/telepathy-glib/contact-search.c
>+++ b/telepathy-glib/contact-search.c
>@@ -215,10 +215,10 @@ _create_search_channel_cb (GObject *source_object,
> 
>   DEBUG ("Got channel: %s", tp_proxy_get_object_path (self->priv->channel));
> 
>-  if (tp_cli_channel_type_contact_search_connect_to_search_result_received (
>+  if (tp_cli_channel_type_contact_search1_connect_to_search_result_received (
>           self->priv->channel, _search_results_received,
>           NULL, NULL, G_OBJECT (self), &error) == NULL ||
>-      tp_cli_channel_type_contact_search_connect_to_search_state_changed (
>+      tp_cli_channel_type_contact_search1_connect_to_search_state_changed (
>           self->priv->channel, _search_state_changed,
>           NULL, NULL, G_OBJECT (self), &error) == NULL)
>     {
>@@ -229,9 +229,9 @@ _create_search_channel_cb (GObject *source_object,
>   properties = _tp_channel_get_immutable_properties (self->priv->channel);
> 
>   self->priv->keys = tp_asv_get_strv (properties,
>-      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_AVAILABLE_SEARCH_KEYS);
>+      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_AVAILABLE_SEARCH_KEYS);
>   server = tp_asv_get_string (properties,
>-      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER);
>+      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_SERVER);
>   if (g_strcmp0 (server, self->priv->server) != 0)
>     {
>       g_free (self->priv->server);
>@@ -239,7 +239,7 @@ _create_search_channel_cb (GObject *source_object,
>       g_object_notify (G_OBJECT (self), "server");
>     }
>   limit = tp_asv_get_uint32 (properties,
>-      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT, &valid);
>+      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_LIMIT, &valid);
>   if (valid && limit != self->priv->limit)
>     {
>       self->priv->limit = limit;
>@@ -275,17 +275,17 @@ tp_contact_search_open_new_channel (TpContactSearch *self)
>   request = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE,
>       G_TYPE_STRING,
>-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH,
>+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1,
>       NULL);
> 
>   if (self->priv->server != NULL)
>     tp_asv_set_string (request,
>-        TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER,
>+        TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_SERVER,
>         self->priv->server);
> 
>   if (self->priv->limit != 0)
>     tp_asv_set_uint32 (request,
>-      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT,
>+      TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH1_LIMIT,
>       self->priv->limit);
> 
>   channel_request = tp_account_channel_request_new (self->priv->account,
>@@ -663,7 +663,7 @@ tp_contact_search_start (TpContactSearch *self,
>   g_return_if_fail (self->priv->state ==
>       TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED);
> 
>-  tp_cli_channel_type_contact_search_call_search (self->priv->channel,
>+  tp_cli_channel_type_contact_search1_call_search (self->priv->channel,
>       -1, criteria, NULL, NULL, NULL, NULL);
> }
> 
>diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
>index f56f9fc..c0341fe 100644
>--- a/telepathy-glib/contact.c
>+++ b/telepathy-glib/contact.c
>@@ -256,7 +256,7 @@ tp_contact_get_feature_quark_client_types (void)
>  * have been set.
>  *
>  * This feature requires a Connection implementing the
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST interface.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1 interface.
>  *
>  * Since: 0.99.1
>  */
>@@ -278,7 +278,7 @@ tp_contact_get_feature_quark_subscription_states (void)
>  * property has been set.
>  *
>  * This feature requires a Connection implementing the
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS interface.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1 interface.
>  *
>  * Since: 0.99.1
>  */
>@@ -300,7 +300,7 @@ tp_contact_get_feature_quark_contact_groups (void)
>  * has been set.
>  *
>  * This feature requires a Connection implementing the
>- * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING interface.
>+ * %TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1 interface.
>  *
>  * Since: 0.99.1
>  */
>@@ -990,7 +990,7 @@ tp_contact_set_contact_groups_async (TpContact *self,
>   result = g_simple_async_result_new (G_OBJECT (self),
>       callback, user_data, tp_contact_set_contact_groups_finish);
> 
>-  tp_cli_connection_interface_contact_groups_call_set_contact_groups (
>+  tp_cli_connection_interface_contact_groups1_call_set_contact_groups (
>       self->priv->connection, -1, self->priv->handle, (const gchar **) groups,
>       set_contact_groups_cb, result, NULL, G_OBJECT (self));
> 
>@@ -1808,7 +1808,7 @@ contacts_bind_to_aliases_changed (TpConnection *connection)
>     {
>       connection->priv->tracking_aliases_changed = TRUE;
> 
>-      tp_cli_connection_interface_aliasing_connect_to_aliases_changed (
>+      tp_cli_connection_interface_aliasing1_connect_to_aliases_changed (
>           connection, contacts_aliases_changed, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -1926,7 +1926,7 @@ contacts_bind_to_presences_changed (TpConnection *connection)
>     {
>       connection->priv->tracking_presences_changed = TRUE;
> 
>-      tp_cli_connection_interface_presence_connect_to_presences_changed
>+      tp_cli_connection_interface_presence1_connect_to_presences_changed
>         (connection, contacts_presences_changed, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -1951,11 +1951,11 @@ contacts_bind_to_location_updated (TpConnection *connection)
>     {
>       connection->priv->tracking_location_changed = TRUE;
> 
>-      tp_cli_connection_interface_location_connect_to_location_updated
>+      tp_cli_connection_interface_location1_connect_to_location_updated
>         (connection, contacts_location_updated, NULL, NULL, NULL, NULL);
> 
>       tp_connection_add_client_interest (connection,
>-          TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+          TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
>     }
> }
> 
>@@ -1994,7 +1994,7 @@ contacts_bind_to_client_types_updated (TpConnection *connection)
>     {
>       connection->priv->tracking_client_types_updated = TRUE;
> 
>-      tp_cli_connection_interface_client_types_connect_to_client_types_updated
>+      tp_cli_connection_interface_client_types1_connect_to_client_types_updated
>         (connection, contacts_client_types_updated, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2025,7 +2025,7 @@ contacts_bind_to_capabilities_updated (TpConnection *connection)
>     {
>       connection->priv->tracking_contact_caps_changed = TRUE;
> 
>-      tp_cli_connection_interface_contact_capabilities_connect_to_contact_capabilities_changed
>+      tp_cli_connection_interface_contact_capabilities1_connect_to_contact_capabilities_changed
>         (connection, contacts_capabilities_updated, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2244,7 +2244,7 @@ connection_avatar_request_idle_cb (gpointer user_data)
> 
>   DEBUG ("Request %d avatars", connection->priv->avatar_request_queue->len);
> 
>-  tp_cli_connection_interface_avatars_call_request_avatars (connection, -1,
>+  tp_cli_connection_interface_avatars1_call_request_avatars (connection, -1,
>       connection->priv->avatar_request_queue, NULL, NULL, NULL, NULL);
> 
>   g_array_unref (connection->priv->avatar_request_queue);
>@@ -2353,7 +2353,7 @@ contacts_bind_to_avatar_retrieved (TpConnection *connection)
>     {
>       connection->priv->tracking_avatar_retrieved = TRUE;
> 
>-      tp_cli_connection_interface_avatars_connect_to_avatar_retrieved
>+      tp_cli_connection_interface_avatars1_connect_to_avatar_retrieved
>         (connection, contact_avatar_retrieved, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2402,7 +2402,7 @@ contacts_bind_to_avatar_updated (TpConnection *connection)
>     {
>       connection->priv->tracking_avatar_updated = TRUE;
> 
>-      tp_cli_connection_interface_avatars_connect_to_avatar_updated
>+      tp_cli_connection_interface_avatars1_connect_to_avatar_updated
>         (connection, contacts_avatar_updated, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2460,7 +2460,7 @@ contacts_bind_to_contact_info_changed (TpConnection *connection)
>     {
>       connection->priv->tracking_contact_info_changed = TRUE;
> 
>-      tp_cli_connection_interface_contact_info_connect_to_contact_info_changed (
>+      tp_cli_connection_interface_contact_info1_connect_to_contact_info_changed (
>           connection, contact_info_changed, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2615,7 +2615,7 @@ tp_contact_request_contact_info_async (TpContact *self,
>         return;
>     }
> 
>-  data->call = tp_cli_connection_interface_contact_info_call_request_contact_info (
>+  data->call = tp_cli_connection_interface_contact_info1_call_request_contact_info (
>       self->priv->connection, 60*60*1000, self->priv->handle,
>       contact_info_request_cb,
>       data, (GDestroyNotify) contact_info_request_data_free,
>@@ -2684,7 +2684,7 @@ tp_connection_refresh_contact_info (TpConnection *self,
>   for (i = 0; i < n_contacts; i++)
>     g_array_append_val (handles, contacts[i]->priv->handle);
> 
>-  tp_cli_connection_interface_contact_info_call_refresh_contact_info (self, -1,
>+  tp_cli_connection_interface_contact_info1_call_refresh_contact_info (self, -1,
>       handles, NULL, NULL, NULL, NULL);
> 
>   g_array_unref (handles);
>@@ -2777,7 +2777,7 @@ contacts_bind_to_contacts_changed (TpConnection *connection)
>     {
>       connection->priv->tracking_contacts_changed = TRUE;
> 
>-      tp_cli_connection_interface_contact_list_connect_to_contacts_changed
>+      tp_cli_connection_interface_contact_list1_connect_to_contacts_changed
>         (connection, contacts_changed_cb, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2864,7 +2864,7 @@ contacts_bind_to_contact_groups_changed (TpConnection *connection)
>     {
>       connection->priv->tracking_contact_groups_changed = TRUE;
> 
>-      tp_cli_connection_interface_contact_groups_connect_to_groups_changed
>+      tp_cli_connection_interface_contact_groups1_connect_to_groups_changed
>         (connection, contact_groups_changed_cb, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -2882,12 +2882,12 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_ALIAS)
>     {
>       s = tp_asv_get_string (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS);
>+          TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS);
> 
>       if (s == NULL)
>         {
>           WARNING ("%s supposedly implements Contacts and Aliasing, but "
>-              "omitted " TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS,
>+              "omitted " TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS,
>               tp_proxy_get_object_path (connection));
>         }
>       else
>@@ -2903,7 +2903,7 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_AVATAR_TOKEN)
>     {
>       s = tp_asv_get_string (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_AVATARS_TOKEN);
>+          TP_TOKEN_CONNECTION_INTERFACE_AVATARS1_TOKEN);
>       contact_set_avatar_token (contact, s, TRUE);
>     }
> 
>@@ -2918,13 +2918,13 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_PRESENCE)
>     {
>       boxed = tp_asv_get_boxed (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_PRESENCE_PRESENCE,
>+          TP_TOKEN_CONNECTION_INTERFACE_PRESENCE1_PRESENCE,
>           TP_STRUCT_TYPE_PRESENCE);
> 
>       if (boxed == NULL)
>         WARNING ("%s supposedly implements Contacts and Presence, "
>             "but omitted the mandatory "
>-            TP_TOKEN_CONNECTION_INTERFACE_PRESENCE_PRESENCE
>+            TP_TOKEN_CONNECTION_INTERFACE_PRESENCE1_PRESENCE
>             " attribute",
>             tp_proxy_get_object_path (connection));
>       else
>@@ -2935,7 +2935,7 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_LOCATION)
>     {
>       boxed = tp_asv_get_boxed (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION,
>+          TP_TOKEN_CONNECTION_INTERFACE_LOCATION1_LOCATION,
>           TP_HASH_TYPE_LOCATION);
>       contact_maybe_set_location (contact, boxed);
>     }
>@@ -2944,7 +2944,7 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_CAPABILITIES)
>     {
>       boxed = tp_asv_get_boxed (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES,
>+          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1_CAPABILITIES,
>           TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST);
>       contact_maybe_set_capabilities (contact, boxed);
>     }
>@@ -2953,7 +2953,7 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_CONTACT_INFO)
>     {
>       boxed = tp_asv_get_boxed (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO_INFO,
>+          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO1_INFO,
>           TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST);
>       contact_maybe_set_info (contact, boxed);
>     }
>@@ -2962,7 +2962,7 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_CLIENT_TYPES)
>     {
>       boxed = tp_asv_get_boxed (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES,
>+          TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES1_CLIENT_TYPES,
>           G_TYPE_STRV);
>       contact_maybe_set_client_types (contact, boxed);
>     }
>@@ -2977,13 +2977,13 @@ tp_contact_set_attributes (TpContact *contact,
>       gboolean publish_valid = FALSE;
> 
>       subscribe = tp_asv_get_uint32 (asv,
>-            TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE,
>+            TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_SUBSCRIBE,
>             &subscribe_valid);
>       publish = tp_asv_get_uint32 (asv,
>-            TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH,
>+            TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH,
>             &publish_valid);
>       publish_request = tp_asv_get_string (asv,
>-            TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST);
>+            TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH_REQUEST);
> 
>       if (subscribe_valid && publish_valid)
>         {
>@@ -2996,7 +2996,7 @@ tp_contact_set_attributes (TpContact *contact,
>   if (wanted & CONTACT_FEATURE_FLAG_CONTACT_GROUPS)
>     {
>       boxed = tp_asv_get_boxed (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS,
>+          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS,
>           G_TYPE_STRV);
>       contact_maybe_set_contact_groups (contact, boxed);
>     }
>@@ -3007,7 +3007,7 @@ tp_contact_set_attributes (TpContact *contact,
>       gboolean is_blocked, valid;
> 
>       is_blocked = tp_asv_get_boolean (asv,
>-          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED, &valid);
>+          TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING1_BLOCKED, &valid);
> 
>       if (valid)
>         _tp_contact_set_is_blocked (contact, is_blocked);
>@@ -3073,25 +3073,25 @@ contacts_bind_to_signals (TpConnection *connection,
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_ALIAS) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_ALIASING);
>+          TP_IFACE_CONNECTION_INTERFACE_ALIASING1);
>       contacts_bind_to_aliases_changed (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_AVATAR_TOKEN) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_AVATARS);
>+          TP_IFACE_CONNECTION_INTERFACE_AVATARS1);
>       contacts_bind_to_avatar_updated (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_AVATAR_DATA) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1))
>     {
>       contacts_bind_to_avatar_retrieved (connection);
>     }
>@@ -3099,75 +3099,75 @@ contacts_bind_to_signals (TpConnection *connection,
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_PRESENCE) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_PRESENCE);
>+          TP_IFACE_CONNECTION_INTERFACE_PRESENCE1);
>       contacts_bind_to_presences_changed (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_LOCATION) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+          TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
>       contacts_bind_to_location_updated (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_CAPABILITIES) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES);
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1);
>       contacts_bind_to_capabilities_updated (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_CONTACT_INFO) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO);
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1);
>       contacts_bind_to_contact_info_changed (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_CLIENT_TYPES) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES);
>+          TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1);
>       contacts_bind_to_client_types_updated (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_STATES) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST);
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1);
>       contacts_bind_to_contacts_changed (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_CONTACT_GROUPS) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS1))
>     {
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS);
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1);
>       contacts_bind_to_contact_groups_changed (connection);
>     }
> 
>   if ((wanted & CONTACT_FEATURE_FLAG_CONTACT_BLOCKING) != 0 &&
>       tp_proxy_has_interface_by_id (connection,
>-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
>+          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
>     {
>       GQuark features[] = { TP_CONNECTION_FEATURE_CONTACT_BLOCKING, 0 };
> 
>       g_ptr_array_add (array,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING);
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1);
> 
>       /* The BlockedContactsChanged signal is already handled by
>        * connection-contact-list.c so we just have to prepare
>diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
>index 069d21b..6bb0a57 100644
>--- a/telepathy-glib/dbus-tube-channel.c
>+++ b/telepathy-glib/dbus-tube-channel.c
>@@ -30,10 +30,10 @@
>  *
>  * |[
>  * GHashTable *request_properties = tp_asv_new (
>- *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
>+ *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
>  *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
>  *     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, tp_contact_get_identifier (contact),
>- *     TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME, G_TYPE_STRING, "com.example.walrus",
>+ *     TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME, G_TYPE_STRING, "com.example.walrus",
>  *     NULL);
>  * TpAccountChannelRequest *req = tp_account_channel_request_new (account,
>  *     request_properties, TP_USER_ACTION_TIME_NOT_USER_ACTION);
>@@ -274,7 +274,7 @@ tp_dbus_tube_channel_constructed (GObject *obj)
>     chain_up (obj);
> 
>   if (tp_channel_get_channel_type_id (chan) !=
>-      TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE)
>+      TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE1)
>     {
>       GError error = { TP_DBUS_ERRORS, TP_DBUS_ERROR_INCONSISTENT,
>           "Channel is not a D-Bus tube" };
>@@ -288,7 +288,7 @@ tp_dbus_tube_channel_constructed (GObject *obj)
> 
>   props = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
> 
>-  if (tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME)
>+  if (tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME)
>       == NULL)
>     {
>       GError error = { TP_DBUS_ERRORS, TP_DBUS_ERROR_INCONSISTENT,
>@@ -307,7 +307,7 @@ tp_dbus_tube_channel_constructed (GObject *obj)
>       GHashTable *params;
> 
>       params = tp_asv_get_boxed (props,
>-          TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS,
>+          TP_PROP_CHANNEL_INTERFACE_TUBE1_PARAMETERS,
>           TP_HASH_TYPE_STRING_VARIANT_MAP);
> 
>       if (params == NULL)
>@@ -365,7 +365,7 @@ tp_dbus_tube_channel_prepare_core_feature_async (TpProxy *proxy,
>   result = g_simple_async_result_new ((GObject *) proxy, callback, user_data,
>       tp_dbus_tube_channel_prepare_core_feature_async);
> 
>-  if (tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed (chan,
>+  if (tp_cli_channel_interface_tube1_connect_to_tube_channel_state_changed (chan,
>         tube_state_changed_cb, proxy, NULL, NULL, &error) == NULL)
>     {
>       WARNING ("Failed to connect to TubeChannelStateChanged on %s: %s",
>@@ -374,7 +374,7 @@ tp_dbus_tube_channel_prepare_core_feature_async (TpProxy *proxy,
>     }
> 
>   tp_cli_dbus_properties_call_get (proxy, -1,
>-      TP_IFACE_CHANNEL_INTERFACE_TUBE, "State",
>+      TP_IFACE_CHANNEL_INTERFACE_TUBE1, "State",
>       get_state_cb, result, g_object_unref, G_OBJECT (proxy));
> }
> 
>@@ -518,7 +518,7 @@ tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *self)
> 
>   props = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
> 
>-  return tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+  return tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
> }
> 
> /**
>@@ -646,7 +646,7 @@ proxy_prepare_offer_cb (GObject *source,
>    * an environment where you need to disable authentication. tp-glib can't
>    * guess this for you.
>    */
>-  tp_cli_channel_type_dbus_tube_call_offer (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_dbus_tube1_call_offer (TP_CHANNEL (self), -1,
>       self->priv->parameters, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS,
>       dbus_tube_offer_cb, NULL, NULL, G_OBJECT (self));
> 
>@@ -763,7 +763,7 @@ proxy_prepare_accept_cb (GObject *source,
>    * an environment where you need to disable authentication. tp-glib can't
>    * guess this for you.
>    */
>-  tp_cli_channel_type_dbus_tube_call_accept (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_dbus_tube1_call_accept (TP_CHANNEL (self), -1,
>       TP_SOCKET_ACCESS_CONTROL_CREDENTIALS, dbus_tube_accept_cb,
>       NULL, NULL, G_OBJECT (self));
> }
>diff --git a/telepathy-glib/debug-client.c b/telepathy-glib/debug-client.c
>index 3da0191..986f63f 100644
>--- a/telepathy-glib/debug-client.c
>+++ b/telepathy-glib/debug-client.c
>@@ -158,7 +158,7 @@ tp_debug_client_constructed (GObject *object)
>       name_owner_changed_cb, object, NULL);
>   tp_debug_client_prepare_core (self);
> 
>-  if (!tp_cli_debug_connect_to_new_debug_message (self, new_debug_message_cb,
>+  if (!tp_cli_debug1_connect_to_new_debug_message (self, new_debug_message_cb,
>         NULL, NULL, NULL, &error))
>     {
>       WARNING ("Failed to connect to NewDebugMessage: %s", error->message);
>@@ -192,7 +192,7 @@ tp_debug_client_class_init (TpDebugClientClass *klass)
>   object_class->dispose = tp_debug_client_dispose;
> 
>   proxy_class->must_have_unique_name = TRUE;
>-  proxy_class->interface = TP_IFACE_QUARK_DEBUG;
>+  proxy_class->interface = TP_IFACE_QUARK_DEBUG1;
>   proxy_class->list_features = tp_debug_client_list_features;
> 
>   /**
>@@ -296,7 +296,7 @@ got_enabled_cb (
> static void
> tp_debug_client_prepare_core (TpDebugClient *self)
> {
>-  tp_cli_dbus_properties_call_get (self, -1, TP_IFACE_DEBUG, "Enabled",
>+  tp_cli_dbus_properties_call_get (self, -1, TP_IFACE_DEBUG1, "Enabled",
>       got_enabled_cb, NULL, NULL, NULL);
> }
> 
>@@ -420,7 +420,7 @@ tp_debug_client_set_enabled_async (
> 
>   g_value_init (&v, G_TYPE_BOOLEAN);
>   g_value_set_boolean (&v, enabled);
>-  tp_cli_dbus_properties_call_set (self, -1, TP_IFACE_DEBUG, "Enabled", &v,
>+  tp_cli_dbus_properties_call_set (self, -1, TP_IFACE_DEBUG1, "Enabled", &v,
>       set_enabled_cb, result, g_object_unref, NULL);
>   g_value_unset (&v);
> }
>@@ -524,7 +524,7 @@ tp_debug_client_get_messages_async (
>   GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (self),
>       callback, user_data, tp_debug_client_set_enabled_async);
> 
>-  tp_cli_debug_call_get_messages (self, -1, get_messages_cb,
>+  tp_cli_debug1_call_get_messages (self, -1, get_messages_cb,
>       result, g_object_unref, NULL);
> }
> 
>diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
>index a0be6c1..e404799 100644
>--- a/telepathy-glib/debug-sender.c
>+++ b/telepathy-glib/debug-sender.c
>@@ -95,7 +95,7 @@ typedef struct {
> G_DEFINE_TYPE_WITH_CODE (TpDebugSender, tp_debug_sender, G_TYPE_OBJECT,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>         tp_dbus_properties_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DEBUG, debug_iface_init))
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DEBUG1, debug_iface_init))
> 
> /* properties */
> enum
>@@ -247,7 +247,7 @@ tp_debug_sender_class_init (TpDebugSenderClass *klass)
>       { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_DEBUG,
>+      { TP_IFACE_DEBUG1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         tp_dbus_properties_mixin_setter_gobject_properties,
>         debug_props,
>@@ -281,7 +281,7 @@ tp_debug_sender_class_init (TpDebugSenderClass *klass)
> }
> 
> static void
>-get_messages (TpSvcDebug *self,
>+get_messages (TpSvcDebug1 *self,
>     DBusGMethodInvocation *context)
> {
>   TpDebugSender *dbg = TP_DEBUG_SENDER (self);
>@@ -308,7 +308,7 @@ get_messages (TpSvcDebug *self,
>       g_ptr_array_add (messages, g_value_get_boxed (&gvalue));
>     }
> 
>-  tp_svc_debug_return_from_get_messages (context, messages);
>+  tp_svc_debug1_return_from_get_messages (context, messages);
> 
>   for (j = 0; j < messages->len; j++)
>     g_boxed_free (TP_STRUCT_TYPE_DEBUG_MESSAGE, messages->pdata[j]);
>@@ -320,9 +320,9 @@ static void
> debug_iface_init (gpointer g_iface,
>     gpointer iface_data)
> {
>-  TpSvcDebugClass *klass = (TpSvcDebugClass *) g_iface;
>+  TpSvcDebug1Class *klass = (TpSvcDebug1Class *) g_iface;
> 
>-  tp_svc_debug_implement_get_messages (klass, get_messages);
>+  tp_svc_debug1_implement_get_messages (klass, get_messages);
> }
> 
> static void
>@@ -374,7 +374,7 @@ _tp_debug_sender_take (TpDebugSender *self,
> 
>   if (self->priv->enabled)
>     {
>-      tp_svc_debug_emit_new_debug_message (self, new_msg->timestamp,
>+      tp_svc_debug1_emit_new_debug_message (self, new_msg->timestamp,
>           new_msg->domain, new_msg->level, new_msg->string);
>     }
> 
>diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c
>index dd6641d..957cfc2 100644
>--- a/telepathy-glib/file-transfer-channel.c
>+++ b/telepathy-glib/file-transfer-channel.c
>@@ -44,15 +44,15 @@
>  *
>  * |[
>  * GHashTable *request = tp_asv_new (
>- *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+ *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>  *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
>  *     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
>- *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
>- *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_INT64, 1320925992,
>- *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, "",
>- *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, "test.pdf",
>- *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, G_TYPE_UINT64, 0,
>- *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, 165710,
>+ *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
>+ *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, G_TYPE_INT64, 1320925992,
>+ *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION, G_TYPE_STRING, "",
>+ *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME, G_TYPE_STRING, "test.pdf",
>+ *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET, G_TYPE_UINT64, 0,
>+ *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, G_TYPE_UINT64, 165710,
>  *     NULL);
>  *
>  * TpAccountChannelRequest *channel_request = tp_account_channel_request_new (
>@@ -472,7 +472,7 @@ tp_file_transfer_channel_prepare_core_async (TpProxy *proxy,
>   GSimpleAsyncResult *result;
>   GError *error = NULL;
> 
>-  tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
>+  tp_cli_channel_type_file_transfer1_connect_to_file_transfer_state_changed (
>       channel, tp_file_transfer_channel_state_changed_cb,
>       NULL, NULL, NULL, &error);
>   if (error != NULL)
>@@ -482,7 +482,7 @@ tp_file_transfer_channel_prepare_core_async (TpProxy *proxy,
>       g_error_free (error);
>     }
> 
>-  tp_cli_channel_type_file_transfer_connect_to_initial_offset_defined (
>+  tp_cli_channel_type_file_transfer1_connect_to_initial_offset_defined (
>       channel, tp_file_transfer_channel_initial_offset_defined_cb,
>       NULL, NULL, NULL, &error);
>   if (error != NULL)
>@@ -492,7 +492,7 @@ tp_file_transfer_channel_prepare_core_async (TpProxy *proxy,
>       g_error_free (error);
>     }
> 
>-  tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed (
>+  tp_cli_channel_type_file_transfer1_connect_to_transferred_bytes_changed (
>       channel, tp_file_transfer_channel_transferred_bytes_changed_cb,
>       NULL, NULL, NULL, &error);
>   if (error != NULL)
>@@ -502,7 +502,7 @@ tp_file_transfer_channel_prepare_core_async (TpProxy *proxy,
>       g_error_free (error);
>     }
> 
>-  tp_cli_channel_type_file_transfer_connect_to_uri_defined (
>+  tp_cli_channel_type_file_transfer1_connect_to_uri_defined (
>       channel, tp_file_transfer_channel_uri_defined_cb,
>       NULL, NULL, NULL, &error);
>   if (error != NULL)
>@@ -516,7 +516,7 @@ tp_file_transfer_channel_prepare_core_async (TpProxy *proxy,
>       tp_file_transfer_channel_prepare_core_async);
> 
>   tp_cli_dbus_properties_call_get_all (self, -1,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>       tp_file_transfer_channel_prepare_core_cb,
>       result, g_object_unref,
>       NULL);
>@@ -536,7 +536,7 @@ tp_file_transfer_channel_constructed (GObject *obj)
>   properties = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
> 
>   self->priv->mime_type = tp_asv_get_string (properties,
>-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE);
>+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE);
>   if (self->priv->mime_type == NULL)
>     {
>       DEBUG ("Channel %s doesn't have FileTransfer.ContentType in its "
>@@ -544,7 +544,7 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   self->priv->filename = tp_asv_get_string (properties,
>-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME);
>+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME);
>   if (self->priv->filename == NULL)
>     {
>       DEBUG ("Channel %s doesn't have FileTransfer.Filename in its "
>@@ -552,7 +552,7 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   self->priv->size = tp_asv_get_uint64 (properties,
>-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, &valid);
>+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, &valid);
>   if (!valid)
>     {
>       DEBUG ("Channel %s doesn't have FileTransfer.Size in its "
>@@ -560,7 +560,7 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   self->priv->content_hash_type = tp_asv_get_uint32 (properties,
>-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE, &valid);
>+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH_TYPE, &valid);
>   if (!valid)
>     {
>       DEBUG ("Channel %s doesn't have FileTransfer.ContentHashType in its "
>@@ -568,7 +568,7 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   self->priv->content_hash = tp_asv_get_string (properties,
>-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH);
>+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH);
>   if (self->priv->content_hash == NULL)
>     {
>       DEBUG ("Channel %s doesn't have FileTransfer.ContentHash in its "
>@@ -576,14 +576,14 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   self->priv->description = tp_asv_get_string (properties,
>-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION);
>+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION);
>   if (self->priv->description == NULL)
>     {
>       DEBUG ("Channel %s doesn't have FileTransfer.Description in its "
>           "immutable properties", tp_proxy_get_object_path (self));
>     }
> 
>-  date = tp_asv_get_int64 (properties, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE,
>+  date = tp_asv_get_int64 (properties, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE,
>       &valid);
> 
>   if (!valid)
>@@ -597,7 +597,7 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   self->priv->available_socket_types = tp_asv_get_boxed (properties,
>-     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_AVAILABLE_SOCKET_TYPES,
>+     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_AVAILABLE_SOCKET_TYPES,
>      TP_HASH_TYPE_SUPPORTED_SOCKET_MAP);
>   if (self->priv->available_socket_types == NULL)
>     {
>@@ -606,15 +606,15 @@ tp_file_transfer_channel_constructed (GObject *obj)
>     }
> 
>   /* URI might be immutable */
>-  uri = tp_asv_get_string (properties, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI);
>+  uri = tp_asv_get_string (properties, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI);
>   if (uri != NULL)
>     self->priv->file = g_file_new_for_uri (uri);
> 
>   self->priv->service_name = tp_asv_get_string (properties,
>-      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME);
>+      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME);
> 
>   self->priv->metadata = tp_asv_get_boxed (properties,
>-     TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
>+     TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_METADATA,
>      TP_HASH_TYPE_METADATA);
> 
>   if (self->priv->metadata == NULL)
>@@ -943,7 +943,7 @@ tp_file_transfer_channel_class_init (TpFileTransferChannelClass *klass)
>    *
>    * |[
>    * tp_base_client_take_handler_filter (handler, tp_asv_new (
>-   *               TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+   *               TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>    *               TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
>    *               TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
>    *               TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, G_TYPE_STRING, "service.name",
>@@ -982,15 +982,15 @@ tp_file_transfer_channel_class_init (TpFileTransferChannelClass *klass)
>    * g_hash_table_insert (metadata, "best buds", values);
>    *
>    * request = tp_asv_new (
>-   *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+   *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>    *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
>    *     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
>-   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
>-   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_INT64, 1320925992,
>-   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, "",
>-   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, "test.pdf",
>-   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, G_TYPE_UINT64, 0,
>-   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, 165710,
>+   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
>+   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, G_TYPE_INT64, 1320925992,
>+   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION, G_TYPE_STRING, "",
>+   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME, G_TYPE_STRING, "test.pdf",
>+   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET, G_TYPE_UINT64, 0,
>+   *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, G_TYPE_UINT64, 165710,
>    *     TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA, TP_TYPE_METADATA, metadata,
>    *     NULL);
>    *
>@@ -1225,7 +1225,7 @@ file_transfer_set_uri_cb (TpProxy *proxy,
>     return;
> 
>   /* Call accept */
>-  tp_cli_channel_type_file_transfer_call_accept_file (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_file_transfer1_call_accept_file (TP_CHANNEL (self), -1,
>       self->priv->socket_type,
>       self->priv->access_control,
>       self->priv->access_control_param,
>@@ -1267,7 +1267,7 @@ file_replace_async_cb (GObject *source,
>   value = tp_g_value_slice_new_take_string (uri);
> 
>   tp_cli_dbus_properties_call_set (self, -1,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "URI", value,
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "URI", value,
>       file_transfer_set_uri_cb, NULL, NULL, G_OBJECT (self));
> 
>   tp_g_value_slice_free (value);
>@@ -1382,7 +1382,7 @@ file_read_async_cb (GObject *source,
>     return;
> 
>   /* Call Provide */
>-  tp_cli_channel_type_file_transfer_call_provide_file (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_file_transfer1_call_provide_file (TP_CHANNEL (self), -1,
>       self->priv->socket_type,
>       self->priv->access_control,
>       self->priv->access_control_param,
>diff --git a/telepathy-glib/group-mixin.c b/telepathy-glib/group-mixin.c
>index 16fb83f..8c9eb08 100644
>--- a/telepathy-glib/group-mixin.c
>+++ b/telepathy-glib/group-mixin.c
>@@ -25,7 +25,7 @@
>  * SECTION:group-mixin
>  * @title: TpGroupMixin
>  * @short_description: a mixin implementation of the groups interface
>- * @see_also: #TpSvcChannelInterfaceGroup
>+ * @see_also: #TpSvcChannelInterfaceGroup1
>  *
>  * This mixin can be added to a channel GObject class to implement the
>  * groups interface in a general way.
>@@ -37,8 +37,8 @@
>  * tp_group_mixin_finalize() from your dispose or finalize function.
>  *
>  * To use the group mixin as the implementation of
>- * #TpSvcChannelInterfaceGroup, call
>- * <literal>G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+ * #TpSvcChannelInterfaceGroup1, call
>+ * <literal>G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>  * tp_group_mixin_iface_init)</literal> in the fourth argument to
>  * <literal>G_DEFINE_TYPE_WITH_CODE</literal>.
>  *
>@@ -47,7 +47,7 @@
>  * for old Tubes channels). To do this, call tp_external_group_mixin_init()
>  * in the constructor after the associated object has been set,
>  * tp_external_group_mixin_finalize() in the dispose or finalize function, and
>- * <literal>G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+ * <literal>G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>  * tp_external_group_mixin_iface_init)</literal> in the fourth argument to
>  * <literal>G_DEFINE_TYPE_WITH_CODE</literal>.
>  *
>@@ -443,7 +443,7 @@ tp_group_mixin_change_self_handle (GObject *obj,
> 
>   mixin->self_handle = new_self_handle;
> 
>-  tp_svc_channel_interface_group_emit_self_contact_changed (obj,
>+  tp_svc_channel_interface_group1_emit_self_contact_changed (obj,
>       new_self_handle, new_self_id);
> }
> 
>@@ -549,7 +549,7 @@ tp_group_mixin_add_members (GObject *obj,
> }
> 
> static void
>-tp_group_mixin_add_members_async (TpSvcChannelInterfaceGroup *obj,
>+tp_group_mixin_add_members_async (TpSvcChannelInterfaceGroup1 *obj,
>                                   const GArray *contacts,
>                                   const gchar *message,
>                                   DBusGMethodInvocation *context)
>@@ -558,7 +558,7 @@ tp_group_mixin_add_members_async (TpSvcChannelInterfaceGroup *obj,
> 
>   if (tp_group_mixin_add_members ((GObject *) obj, contacts, message, &error))
>     {
>-      tp_svc_channel_interface_group_return_from_add_members (context);
>+      tp_svc_channel_interface_group1_return_from_add_members (context);
>     }
>   else
>     {
>@@ -688,7 +688,7 @@ tp_group_mixin_remove_members (GObject *obj,
> 
> static void
> tp_group_mixin_remove_members_async
>-    (TpSvcChannelInterfaceGroup *obj,
>+    (TpSvcChannelInterfaceGroup1 *obj,
>      const GArray *contacts,
>      const gchar *message,
>      guint reason,
>@@ -699,7 +699,7 @@ tp_group_mixin_remove_members_async
>   if (tp_group_mixin_remove_members ((GObject *) obj, contacts,
>         message, reason, &error))
>     {
>-      tp_svc_channel_interface_group_return_from_remove_members
>+      tp_svc_channel_interface_group1_return_from_remove_members
>         (context);
>     }
>   else
>@@ -1039,7 +1039,7 @@ tp_group_mixin_change_flags (GObject *obj,
>           g_free (str_flags);
>         }
> 
>-      tp_svc_channel_interface_group_emit_group_flags_changed (obj, added,
>+      tp_svc_channel_interface_group1_emit_group_flags_changed (obj, added,
>           removed);
>       if (mixin->priv->externals != NULL)
>         {
>@@ -1047,7 +1047,7 @@ tp_group_mixin_change_flags (GObject *obj,
> 
>           for (i = 0; i < mixin->priv->externals->len; i++)
>             {
>-              tp_svc_channel_interface_group_emit_group_flags_changed
>+              tp_svc_channel_interface_group1_emit_group_flags_changed
>                 ((GObject *) g_ptr_array_index (mixin->priv->externals, i),
>                  added, removed);
>             }
>@@ -1253,7 +1253,7 @@ emit_members_changed_signals (GObject *channel,
>   added_contact_ids = maybe_add_contact_ids (mixin, add, local_pending,
>       remote_pending, actor, details_);
> 
>-  tp_svc_channel_interface_group_emit_members_changed (channel,
>+  tp_svc_channel_interface_group1_emit_members_changed (channel,
>       add, del, local_pending, remote_pending, details_);
> 
>   if (mixin->priv->externals != NULL)
>@@ -1264,7 +1264,7 @@ emit_members_changed_signals (GObject *channel,
>         {
>           GObject *external = g_ptr_array_index (mixin->priv->externals, i);
> 
>-          tp_svc_channel_interface_group_emit_members_changed (
>+          tp_svc_channel_interface_group1_emit_members_changed (
>               external, add, del, local_pending, remote_pending, details_);
>         }
>     }
>@@ -1399,7 +1399,7 @@ change_members (GObject *obj,
>         {
>           GHashTable *empty_hash_table = g_hash_table_new (NULL, NULL);
> 
>-          tp_svc_channel_interface_group_emit_handle_owners_changed (
>+          tp_svc_channel_interface_group1_emit_handle_owners_changed (
>               obj, empty_hash_table, arr_owners_removed, empty_hash_table);
> 
>           if (mixin->priv->externals != NULL)
>@@ -1408,7 +1408,7 @@ change_members (GObject *obj,
> 
>               for (i = 0; i < mixin->priv->externals->len; i++)
>                 {
>-                  tp_svc_channel_interface_group_emit_handle_owners_changed (
>+                  tp_svc_channel_interface_group1_emit_handle_owners_changed (
>                       g_ptr_array_index (mixin->priv->externals, i),
>                       empty_hash_table, arr_owners_removed, empty_hash_table);
>                 }
>@@ -1640,7 +1640,7 @@ tp_group_mixin_add_handle_owners (GObject *obj,
>       mixin);
> 
>   add_us_mapping_for_owners_map (ids, mixin->handle_repo, local_to_owner_handle);
>-  tp_svc_channel_interface_group_emit_handle_owners_changed (obj,
>+  tp_svc_channel_interface_group1_emit_handle_owners_changed (obj,
>       local_to_owner_handle, empty_array, ids);
> 
>   g_array_unref (empty_array);
>@@ -1702,7 +1702,7 @@ dup_member_identifiers (GObject *obj)
> 
> /**
>  * tp_group_mixin_iface_init: (skip)
>- * @g_iface: A #TpSvcChannelInterfaceGroupClass
>+ * @g_iface: A #TpSvcChannelInterfaceGroup1Class
>  * @iface_data: Unused
>  *
>  * Fill in the vtable entries needed to implement the group interface using
>@@ -1712,9 +1712,9 @@ dup_member_identifiers (GObject *obj)
> void
> tp_group_mixin_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcChannelInterfaceGroupClass *klass = g_iface;
>+  TpSvcChannelInterfaceGroup1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_group_implement_##x (klass,\
>+#define IMPLEMENT(x) tp_svc_channel_interface_group1_implement_##x (klass,\
>     tp_group_mixin_##x##_async)
>   IMPLEMENT(add_members);
>   IMPLEMENT(remove_members);
>@@ -1737,7 +1737,7 @@ enum {
> /**
>  * tp_group_mixin_get_dbus_property: (skip)
>  * @object: An object with this mixin
>- * @interface: Must be %TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP
>+ * @interface: Must be %TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1
>  * @name: A quark representing the D-Bus property name, either
>  *  "GroupFlags", "HandleOwners", "LocalPendingMembers", "Members",
>  *  "RemotePendingMembers" or "SelfHandle"
>@@ -1776,7 +1776,7 @@ tp_group_mixin_get_dbus_property (GObject *object,
>   g_return_if_fail (object != NULL);
>   mixin = TP_GROUP_MIXIN (object);
>   g_return_if_fail (mixin != NULL);
>-  g_return_if_fail (interface == TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);
>+  g_return_if_fail (interface == TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1);
>   g_return_if_fail (name != 0);
>   g_return_if_fail (value != NULL);
> 
>@@ -1869,7 +1869,7 @@ tp_group_mixin_init_dbus_properties (GObjectClass *cls)
> {
> 
>   tp_dbus_properties_mixin_implement_interface (cls,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP, tp_group_mixin_get_dbus_property,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1, tp_group_mixin_get_dbus_property,
>       NULL, known_group_props);
> }
> 
>@@ -1949,7 +1949,7 @@ tp_external_group_mixin_init_dbus_properties (GObjectClass *cls)
> {
> 
>   tp_dbus_properties_mixin_implement_interface (cls,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1,
>       tp_external_group_mixin_get_dbus_property,
>       NULL, known_group_props);
> }
>@@ -1957,7 +1957,7 @@ tp_external_group_mixin_init_dbus_properties (GObjectClass *cls)
> /**
>  * tp_external_group_mixin_get_dbus_property: (skip)
>  * @object: An object with this mixin
>- * @interface: Must be %TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP
>+ * @interface: Must be %TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1
>  * @name: A quark representing the D-Bus property name, either
>  *  "GroupFlags", "HandleOwners", "LocalPendingMembers", "Members",
>  *  "RemotePendingMembers" or "SelfHandle"
>@@ -2013,19 +2013,19 @@ tp_external_group_mixin_get_dbus_property (GObject *object,
>       } \
> 
> static void
>-tp_external_group_mixin_add_members_async (TpSvcChannelInterfaceGroup *obj,
>+tp_external_group_mixin_add_members_async (TpSvcChannelInterfaceGroup1 *obj,
>                                            const GArray *contacts,
>                                            const gchar *message,
>                                            DBusGMethodInvocation *context)
> {
>   EXTERNAL_OR_DIE (group)
>-  tp_group_mixin_add_members_async ((TpSvcChannelInterfaceGroup *) group,
>+  tp_group_mixin_add_members_async ((TpSvcChannelInterfaceGroup1 *) group,
>       contacts, message, context);
> }
> 
> static void
> tp_external_group_mixin_remove_members_async
>-    (TpSvcChannelInterfaceGroup *obj,
>+    (TpSvcChannelInterfaceGroup1 *obj,
>      const GArray *contacts,
>      const gchar *message,
>      guint reason,
>@@ -2033,12 +2033,12 @@ tp_external_group_mixin_remove_members_async
> {
>   EXTERNAL_OR_DIE (group)
>   tp_group_mixin_remove_members_async
>-      ((TpSvcChannelInterfaceGroup *) group, contacts, message, reason,
>+      ((TpSvcChannelInterfaceGroup1 *) group, contacts, message, reason,
>        context);
> }
> /**
>  * tp_external_group_mixin_iface_init: (skip)
>- * @g_iface: A #TpSvcChannelInterfaceGroupClass
>+ * @g_iface: A #TpSvcChannelInterfaceGroup1Class
>  * @iface_data: Unused
>  *
>  * Fill in the vtable entries needed to implement the group interface using
>@@ -2051,9 +2051,9 @@ void
> tp_external_group_mixin_iface_init (gpointer g_iface,
>                                     gpointer iface_data)
> {
>-  TpSvcChannelInterfaceGroupClass *klass = g_iface;
>+  TpSvcChannelInterfaceGroup1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_group_implement_##x (klass,\
>+#define IMPLEMENT(x) tp_svc_channel_interface_group1_implement_##x (klass,\
>     tp_external_group_mixin_##x##_async)
>   IMPLEMENT(add_members);
>   IMPLEMENT(remove_members);
>diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c
>index 82c34d8..128fe66 100644
>--- a/telepathy-glib/message-mixin.c
>+++ b/telepathy-glib/message-mixin.c
>@@ -51,7 +51,7 @@
>  * include the following in the fourth argument of G_DEFINE_TYPE_WITH_CODE():
>  *
>  * <informalexample><programlisting>
>- *  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE,
>+ *  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE1,
>  *    tp_message_mixin_chat_state_iface_init);
>  * </programlisting></informalexample>
>  *
>@@ -324,7 +324,7 @@ tp_message_mixin_change_chat_state (GObject *object,
>           GUINT_TO_POINTER (state));
>     }
> 
>-  tp_svc_channel_interface_chat_state_emit_chat_state_changed (object,
>+  tp_svc_channel_interface_chat_state1_emit_chat_state_changed (object,
>       member, state);
> }
> 
>@@ -387,7 +387,7 @@ tp_message_mixin_maybe_send_gone (GObject *object)
> }
> 
> static void
>-tp_message_mixin_set_chat_state_async (TpSvcChannelInterfaceChatState *iface,
>+tp_message_mixin_set_chat_state_async (TpSvcChannelInterfaceChatState1 *iface,
>     guint state,
>     DBusGMethodInvocation *context)
> {
>@@ -428,7 +428,7 @@ tp_message_mixin_set_chat_state_async (TpSvcChannelInterfaceChatState *iface,
>       tp_base_channel_get_self_handle ((TpBaseChannel *) object),
>       state);
> 
>-  tp_svc_channel_interface_chat_state_return_from_set_chat_state (context);
>+  tp_svc_channel_interface_chat_state1_return_from_set_chat_state (context);
>   return;
> 
> error:
>@@ -964,10 +964,10 @@ tp_message_mixin_init_dbus_properties (GObjectClass *cls)
>       TP_IFACE_QUARK_CHANNEL_TYPE_TEXT,
>       tp_message_mixin_get_dbus_property, NULL, props);
> 
>-  if (g_type_is_a (type, TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE))
>+  if (g_type_is_a (type, TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE1))
>     {
>       tp_dbus_properties_mixin_implement_interface (cls,
>-          TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE,
>+          TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE1,
>           tp_message_mixin_get_dbus_property, NULL, chat_state_props);
>     }
> }
>@@ -1020,7 +1020,7 @@ tp_message_mixin_get_dbus_property (GObject *object,
>   mixin = TP_MESSAGE_MIXIN (object);
> 
>   g_return_if_fail (interface == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT ||
>-      interface == TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE);
>+      interface == TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE1);
>   g_return_if_fail (object != NULL);
>   g_return_if_fail (name != 0);
>   g_return_if_fail (value != NULL);
>@@ -1093,7 +1093,7 @@ tp_message_mixin_iface_init (gpointer g_iface,
> 
> /**
>  * tp_message_mixin_chat_state_iface_init:
>- * @g_iface: A pointer to the #TpSvcChannelInterfaceChatStateClass in an object
>+ * @g_iface: A pointer to the #TpSvcChannelInterfaceChatState1Class in an object
>  *  class
>  * @iface_data: Ignored
>  *
>@@ -1106,9 +1106,9 @@ void
> tp_message_mixin_chat_state_iface_init (gpointer g_iface,
>                                         gpointer iface_data)
> {
>-  TpSvcChannelInterfaceChatStateClass *klass = g_iface;
>+  TpSvcChannelInterfaceChatState1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_chat_state_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_interface_chat_state1_implement_##x (\
>     klass, tp_message_mixin_##x##_async)
>   IMPLEMENT (set_chat_state);
> #undef IMPLEMENT
>diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c
>index e86f881..c4f57c7 100644
>--- a/telepathy-glib/presence-mixin.c
>+++ b/telepathy-glib/presence-mixin.c
>@@ -37,7 +37,7 @@
>  * <title>Implementing Presence</title>
>  * <para>
>  *   Since 0.7.13 this mixin supports the entire Presence interface.
>- *   You can implement #TpSvcConnectionInterfacePresence as follows:
>+ *   You can implement #TpSvcConnectionInterfacePresence1 as follows:
>  *   <itemizedlist>
>  *     <listitem>
>  *       <para>use the #TpContactsMixin and
>@@ -51,7 +51,7 @@
>  *       G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
>  *           TP_TYPE_BASE_CONNECTION,
>  *           // ...
>- *           G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
>+ *           G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
>  *               tp_presence_mixin_iface_init);
>  *           // ...
>  *           )
>@@ -508,7 +508,7 @@ tp_presence_mixin_emit_presence_update (GObject *obj,
> 
>   presence_hash = construct_presence_hash (mixin_cls->statuses,
>       contact_statuses);
>-  tp_svc_connection_interface_presence_emit_presences_changed (obj,
>+  tp_svc_connection_interface_presence1_emit_presences_changed (obj,
>       presence_hash);
> 
>   g_hash_table_unref (presence_hash);
>@@ -735,7 +735,7 @@ void
> tp_presence_mixin_init_dbus_properties (GObjectClass *cls)
> {
>   tp_dbus_properties_mixin_implement_interface (cls,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE,
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE1,
>       tp_presence_mixin_get_dbus_property,
>       NULL, known_presence_props);
> }
>@@ -751,7 +751,7 @@ tp_presence_mixin_init_dbus_properties (GObjectClass *cls)
>  */
> static void
> tp_presence_mixin_set_presence (
>-    TpSvcConnectionInterfacePresence *iface,
>+    TpSvcConnectionInterfacePresence1 *iface,
>     const gchar *status,
>     const gchar *message,
>     DBusGMethodInvocation *context)
>@@ -786,7 +786,7 @@ tp_presence_mixin_set_presence (
> out:
>   if (error == NULL)
>     {
>-      tp_svc_connection_interface_presence_return_from_set_presence (
>+      tp_svc_connection_interface_presence1_return_from_set_presence (
>           context);
>     }
>   else
>@@ -856,7 +856,7 @@ construct_presence_hash (const TpPresenceStatusSpec *supported_statuses,
> 
> /**
>  * tp_presence_mixin_iface_init: (skip)
>- * @g_iface: A pointer to the #TpSvcConnectionInterfacePresenceClass in
>+ * @g_iface: A pointer to the #TpSvcConnectionInterfacePresence1Class in
>  * an object class
>  * @iface_data: Ignored
>  *
>@@ -870,9 +870,9 @@ void
> tp_presence_mixin_iface_init (gpointer g_iface,
>                                        gpointer iface_data)
> {
>-  TpSvcConnectionInterfacePresenceClass *klass = g_iface;
>+  TpSvcConnectionInterfacePresence1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_presence_implement_##x\
>+#define IMPLEMENT(x) tp_svc_connection_interface_presence1_implement_##x\
>  (klass, tp_presence_mixin_##x)
>   IMPLEMENT(set_presence);
> #undef IMPLEMENT
>@@ -908,7 +908,7 @@ tp_presence_mixin_fill_contact_attributes (GObject *obj,
>               status, mixin_cls->statuses);
> 
>           tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
>-              TP_TOKEN_CONNECTION_INTERFACE_PRESENCE_PRESENCE,
>+              TP_TOKEN_CONNECTION_INTERFACE_PRESENCE1_PRESENCE,
>               tp_g_value_slice_new_take_boxed (type, presence));
>         }
> 
>@@ -929,7 +929,7 @@ void
> tp_presence_mixin_register_with_contacts_mixin (GObject *obj)
> {
>   tp_contacts_mixin_add_contact_attributes_iface (obj,
>-      TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>+      TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>       tp_presence_mixin_fill_contact_attributes);
> }
> 
>diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
>index 40305b3..3bec5c1 100644
>--- a/telepathy-glib/protocol.c
>+++ b/telepathy-glib/protocol.c
>@@ -508,25 +508,25 @@ tp_protocol_constructed (GObject *object)
>   tp_proxy_add_interfaces (proxy, interfaces);
> 
>   if (tp_proxy_has_interface_by_id (self,
>-        TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS))
>+        TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS1))
>     {
>       self->priv->avatar_req = tp_avatar_requirements_new (
>           (GStrv) tp_asv_get_strv (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_SUPPORTED_AVATAR_MIME_TYPES),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH, NULL),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_WIDTH, NULL),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT, NULL),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_HEIGHT, NULL),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH, NULL),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_WIDTH, NULL),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT, NULL),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_HEIGHT, NULL),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH, NULL),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_WIDTH, NULL),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT, NULL),
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_HEIGHT, NULL),
>           tp_asv_get_uint32 (self->priv->protocol_properties,
>-            TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES, NULL));
>+            TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_BYTES, NULL));
>     }
> 
>   /* become ready immediately */
>@@ -1653,30 +1653,30 @@ _tp_protocol_parse_manager_file (GKeyFile *file,
> 
>   /* Avatars */
>   tp_asv_take_boxed (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_SUPPORTED_AVATAR_MIME_TYPES,
>       G_TYPE_STRV,
>       g_key_file_get_string_list (file, group, "SupportedAvatarMIMETypes",
>         NULL, NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_HEIGHT,
>       g_key_file_get_uint64 (file, group, "MinimumAvatarHeight", NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_WIDTH,
>       g_key_file_get_uint64 (file, group, "MinimumAvatarWidth", NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_HEIGHT,
>       g_key_file_get_uint64 (file, group, "RecommendedAvatarHeight", NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_WIDTH,
>       g_key_file_get_uint64 (file, group, "RecommendedAvatarWidth", NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_HEIGHT,
>       g_key_file_get_uint64 (file, group, "MaximumAvatarHeight", NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_WIDTH,
>       g_key_file_get_uint64 (file, group, "MaximumAvatarWidth", NULL));
>   tp_asv_set_uint32 (immutables,
>-      TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES,
>+      TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_BYTES,
>       g_key_file_get_uint64 (file, group, "MaximumAvatarBytes", NULL));
> 
>   rccs = g_ptr_array_new ();
>diff --git a/telepathy-glib/room-list.c b/telepathy-glib/room-list.c
>index 2bb160a..a7bb44e 100644
>--- a/telepathy-glib/room-list.c
>+++ b/telepathy-glib/room-list.c
>@@ -399,7 +399,7 @@ tp_room_list_start (TpRoomList *self)
> {
>   g_return_if_fail (self->priv->channel != NULL);
> 
>-  tp_cli_channel_type_room_list_call_list_rooms (self->priv->channel, -1,
>+  tp_cli_channel_type_room_list1_call_list_rooms (self->priv->channel, -1,
>       list_rooms_cb, NULL, NULL, G_OBJECT (self));
> }
> 
>@@ -446,14 +446,14 @@ create_channel_cb (GObject *source_object,
>   self->priv->invalidated_id = tp_g_signal_connect_object (self->priv->channel,
>       "invalidated", G_CALLBACK (chan_invalidated_cb), self, 0);
> 
>-  if (tp_cli_channel_type_room_list_connect_to_got_rooms (self->priv->channel,
>+  if (tp_cli_channel_type_room_list1_connect_to_got_rooms (self->priv->channel,
>         got_rooms_cb, NULL, NULL, G_OBJECT (self), &error) == NULL)
>     {
>       DEBUG ("Failed to connect GotRooms signal: %s", error->message);
>       goto out;
>     }
> 
>-  tp_cli_channel_type_room_list_connect_to_listing_rooms (self->priv->channel,
>+  tp_cli_channel_type_room_list1_connect_to_listing_rooms (self->priv->channel,
>       listing_rooms_cb, NULL, NULL, G_OBJECT (self), &error);
>   if (error != NULL)
>     {
>@@ -464,7 +464,7 @@ create_channel_cb (GObject *source_object,
>   properties = _tp_channel_get_immutable_properties (self->priv->channel);
> 
>   server = tp_asv_get_string (properties,
>-      TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER);
>+      TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER);
>   if (tp_strdiff (server, self->priv->server))
>     {
>       if (tp_str_empty (server) && self->priv->server != NULL)
>@@ -498,11 +498,11 @@ open_new_channel (TpRoomList *self)
> 
>   request = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-        TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
>+        TP_IFACE_CHANNEL_TYPE_ROOM_LIST1,
>       NULL);
> 
>   if (self->priv->server != NULL)
>-    tp_asv_set_string (request, TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER,
>+    tp_asv_set_string (request, TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER,
>         self->priv->server);
> 
>   channel_request = tp_account_channel_request_new (self->priv->account,
>diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
>index 54c02b5..815b827 100644
>--- a/telepathy-glib/stream-tube-channel.c
>+++ b/telepathy-glib/stream-tube-channel.c
>@@ -359,7 +359,7 @@ tp_stream_tube_channel_constructed (GObject *obj)
>     chain_up (obj);
> 
>   if (tp_channel_get_channel_type_id (chan) !=
>-      TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE)
>+      TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE1)
>     {
>       GError error = { TP_DBUS_ERRORS, TP_DBUS_ERROR_INCONSISTENT,
>           "Channel is not a stream tube" };
>@@ -373,7 +373,7 @@ tp_stream_tube_channel_constructed (GObject *obj)
> 
>   props = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
> 
>-  if (tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE)
>+  if (tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE)
>       == NULL)
>     {
>       GError error = { TP_DBUS_ERRORS, TP_DBUS_ERROR_INCONSISTENT,
>@@ -392,7 +392,7 @@ tp_stream_tube_channel_constructed (GObject *obj)
>       GHashTable *params;
> 
>       params = tp_asv_get_boxed (props,
>-          TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS,
>+          TP_PROP_CHANNEL_INTERFACE_TUBE1_PARAMETERS,
>           TP_HASH_TYPE_STRING_VARIANT_MAP);
> 
>       if (params == NULL)
>@@ -408,7 +408,7 @@ tp_stream_tube_channel_constructed (GObject *obj)
>         }
>     }
> 
>-  tp_cli_channel_type_stream_tube_connect_to_connection_closed (
>+  tp_cli_channel_type_stream_tube1_connect_to_connection_closed (
>       TP_CHANNEL (self), connection_closed_cb, NULL, NULL,
>       G_OBJECT (self), &err);
> 
>@@ -707,7 +707,7 @@ _channel_accepted (TpChannel *channel,
>       return;
>     }
> 
>-  tp_cli_channel_type_stream_tube_connect_to_new_local_connection (
>+  tp_cli_channel_type_stream_tube1_connect_to_new_local_connection (
>       TP_CHANNEL (self), new_local_connection_cb, NULL, NULL,
>       G_OBJECT (self), &error);
> 
>@@ -808,7 +808,7 @@ tp_stream_tube_channel_accept_async (TpStreamTubeChannel *self,
> 
>   properties = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
>   supported_sockets = tp_asv_get_boxed (properties,
>-      TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SUPPORTED_SOCKET_TYPES,
>+      TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SUPPORTED_SOCKET_TYPES,
>       TP_HASH_TYPE_SUPPORTED_SOCKET_MAP);
> 
>   if (!_tp_set_socket_address_type_and_access_control_type (supported_sockets,
>@@ -875,7 +875,7 @@ tp_stream_tube_channel_accept_async (TpStreamTubeChannel *self,
>     }
> 
>   /* Call Accept */
>-  tp_cli_channel_type_stream_tube_call_accept (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_stream_tube1_call_accept (TP_CHANNEL (self), -1,
>       self->priv->socket_type, self->priv->access_control,
>       self->priv->access_control_param, _channel_accepted,
>       NULL, NULL, G_OBJECT (self));
>@@ -1188,7 +1188,7 @@ _offer_with_address (TpStreamTubeChannel *self,
>     }
> 
>   /* Connect the NewRemoteConnection signal */
>-  tp_cli_channel_type_stream_tube_connect_to_new_remote_connection (
>+  tp_cli_channel_type_stream_tube1_connect_to_new_remote_connection (
>       TP_CHANNEL (self), _new_remote_connection,
>       NULL, NULL, G_OBJECT (self), &error);
>   if (error != NULL)
>@@ -1209,7 +1209,7 @@ _offer_with_address (TpStreamTubeChannel *self,
>   g_object_notify (G_OBJECT (self), "parameters-vardict");
> 
>   /* Call Offer */
>-  tp_cli_channel_type_stream_tube_call_offer (TP_CHANNEL (self), -1,
>+  tp_cli_channel_type_stream_tube1_call_offer (TP_CHANNEL (self), -1,
>       self->priv->socket_type, addressv, self->priv->access_control,
>       self->priv->parameters, _channel_offered, NULL, NULL, G_OBJECT (self));
> 
>@@ -1371,7 +1371,7 @@ tp_stream_tube_channel_offer_async (TpStreamTubeChannel *self,
> 
>   properties = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
>   supported_sockets = tp_asv_get_boxed (properties,
>-      TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SUPPORTED_SOCKET_TYPES,
>+      TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SUPPORTED_SOCKET_TYPES,
>       TP_HASH_TYPE_SUPPORTED_SOCKET_MAP);
> 
>   if (!_tp_set_socket_address_type_and_access_control_type (supported_sockets,
>@@ -1490,7 +1490,7 @@ tp_stream_tube_channel_get_service (TpStreamTubeChannel *self)
> 
>   props = _tp_channel_get_immutable_properties (TP_CHANNEL (self));
> 
>-  return tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+  return tp_asv_get_string (props, TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
> }
> 
> /**
>diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
>index 7ea5ced..57c0630 100644
>--- a/telepathy-glib/text-channel.c
>+++ b/telepathy-glib/text-channel.c
>@@ -400,12 +400,12 @@ tp_text_channel_prepare_chat_states_async (TpProxy *proxy,
>   result = g_simple_async_result_new ((GObject *) proxy, callback, user_data,
>       tp_text_channel_prepare_chat_states_async);
> 
>-  tp_cli_channel_interface_chat_state_connect_to_chat_state_changed (channel,
>+  tp_cli_channel_interface_chat_state1_connect_to_chat_state_changed (channel,
>       chat_state_changed_cb, NULL, NULL, NULL, &error);
>   g_assert_no_error (error);
> 
>   tp_cli_dbus_properties_call_get (channel, -1,
>-      TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE, "ChatStates",
>+      TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1, "ChatStates",
>       got_chat_states_cb,
>       result, g_object_unref, NULL);
> }
>@@ -500,7 +500,7 @@ tp_text_channel_constructed (GObject *obj)
> 
>   /* SMS */
>   self->priv->sms_flash = tp_asv_get_boolean (props,
>-      TP_PROP_CHANNEL_INTERFACE_SMS_FLASH, NULL);
>+      TP_PROP_CHANNEL_INTERFACE_SMS1_FLASH, NULL);
> }
> 
> static void
>@@ -822,7 +822,7 @@ tp_text_channel_prepare_sms_async (TpProxy *proxy,
>   result = g_simple_async_result_new ((GObject *) proxy, callback, user_data,
>       tp_text_channel_prepare_sms_async);
> 
>-  tp_cli_channel_interface_sms_connect_to_sms_channel_changed (
>+  tp_cli_channel_interface_sms1_connect_to_sms_channel_changed (
>       (TpChannel *) proxy, sms_channel_changed_cb, NULL, NULL,
>       G_OBJECT (proxy), &error);
>   if (error != NULL)
>@@ -833,7 +833,7 @@ tp_text_channel_prepare_sms_async (TpProxy *proxy,
>     }
> 
>   tp_cli_dbus_properties_call_get (proxy, -1,
>-      TP_IFACE_CHANNEL_INTERFACE_SMS, "SMSChannel",
>+      TP_IFACE_CHANNEL_INTERFACE_SMS1, "SMSChannel",
>       get_sms_channel_cb, result, NULL, G_OBJECT (proxy));
> }
> 
>@@ -863,14 +863,14 @@ tp_text_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
>     TP_TEXT_CHANNEL_FEATURE_SMS;
>   features[FEAT_SMS].prepare_async =
>     tp_text_channel_prepare_sms_async;
>-  need_sms[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS;
>+  need_sms[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS1;
>   features[FEAT_SMS].interfaces_needed = need_sms;
> 
>   features[FEAT_CHAT_STATES].name =
>     TP_TEXT_CHANNEL_FEATURE_CHAT_STATES;
>   features[FEAT_CHAT_STATES].prepare_async =
>     tp_text_channel_prepare_chat_states_async;
>-  need_chat_states[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE;
>+  need_chat_states[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE1;
>   features[FEAT_CHAT_STATES].interfaces_needed = need_chat_states;
> 
>   /* assert that the terminator at the end is there */
>@@ -1635,7 +1635,7 @@ tp_text_channel_set_chat_state_async (TpTextChannel *self,
>   result = g_simple_async_result_new (G_OBJECT (self), callback,
>       user_data, tp_text_channel_set_chat_state_async);
> 
>-  tp_cli_channel_interface_chat_state_call_set_chat_state (TP_CHANNEL (self),
>+  tp_cli_channel_interface_chat_state1_call_set_chat_state (TP_CHANNEL (self),
>       -1, state, set_chat_state_cb, result, NULL, G_OBJECT (self));
> }
> 
>@@ -1850,7 +1850,7 @@ tp_text_channel_get_sms_length_async (TpTextChannel *self,
>   result = g_simple_async_result_new ((GObject *) self, callback, user_data,
>       tp_text_channel_get_sms_length_async);
> 
>-  tp_cli_channel_interface_sms_call_get_sms_length ((TpChannel *) self, -1,
>+  tp_cli_channel_interface_sms1_call_get_sms_length ((TpChannel *) self, -1,
>       message->parts, get_sms_length_cb, result, g_object_unref,
>       G_OBJECT (self));
> }
>diff --git a/tests/capabilities.c b/tests/capabilities.c
>index 7eab5e7..021f103 100644
>--- a/tests/capabilities.c
>+++ b/tests/capabilities.c
>@@ -58,8 +58,8 @@ add_ft_class (GPtrArray *classes,
> {
>   GHashTable *fixed;
>   const gchar * const default_allowed[] = {
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE,
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME,
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE,
>       NULL };
>   GValueArray *arr;
> 
>@@ -68,7 +68,7 @@ add_ft_class (GPtrArray *classes,
> 
>   fixed = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_CONTACT,
>       NULL);
>@@ -147,7 +147,7 @@ test_basics (Test *test,
>   g_assert_cmpuint (g_hash_table_size (fixed), ==, 2);
> 
>   chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
>-  g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
>+  g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
> 
>   handle_type = tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
>       &valid);
>@@ -156,9 +156,9 @@ test_basics (Test *test,
> 
>   g_assert_cmpuint (g_strv_length (allowed), ==, 2);
>   g_assert (tp_strv_contains ((const gchar * const * ) allowed,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME));
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME));
>   g_assert (tp_strv_contains ((const gchar * const * ) allowed,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE));
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE));
> 
>   g_object_unref (caps);
> }
>@@ -253,14 +253,14 @@ add_stream_tube_class (GPtrArray *classes,
> 
>   fixed = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           handle_type,
>       NULL);
> 
>   if (service != NULL)
>     {
>-      tp_asv_set_string (fixed, TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE,
>+      tp_asv_set_string (fixed, TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE,
>           service);
>     }
> 
>@@ -286,14 +286,14 @@ add_dbus_tube_class (GPtrArray *classes,
> 
>   fixed = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
>+          TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           handle_type,
>       NULL);
> 
>   if (service_name != NULL)
>     {
>-      tp_asv_set_string (fixed, TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME,
>+      tp_asv_set_string (fixed, TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME,
>           service_name);
>     }
> 
>@@ -604,14 +604,14 @@ add_room_list_class (GPtrArray *classes,
> {
>   GHashTable *fixed;
>   const gchar * const allowed[] = {
>-      TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER,
>+      TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER,
>       NULL };
>   const gchar * const no_allowed[] = { NULL };
>   GValueArray *arr;
> 
>   fixed = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
>+          TP_IFACE_CHANNEL_TYPE_ROOM_LIST1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_NONE,
>       NULL);
>@@ -727,11 +727,11 @@ add_sms_class (GPtrArray *classes,
> 
>   if (use_allowed)
>     {
>-      g_ptr_array_add (allowed, TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL);
>+      g_ptr_array_add (allowed, TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL);
>     }
>   else
>     {
>-      tp_asv_set_boolean (fixed, TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL,
>+      tp_asv_set_boolean (fixed, TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL,
>           TRUE);
>     }
> 
>@@ -820,7 +820,7 @@ add_call_class (GPtrArray *classes,
> 
>   fixed = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_CALL,
>+          TP_IFACE_CHANNEL_TYPE_CALL1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           handle_type,
>       NULL);
>@@ -831,11 +831,11 @@ add_call_class (GPtrArray *classes,
>     {
>       if (use_allowed)
>         {
>-          g_ptr_array_add (allowed, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO);
>+          g_ptr_array_add (allowed, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO);
>         }
>       else
>         {
>-          tp_asv_set_boolean (fixed, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>+          tp_asv_set_boolean (fixed, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>               TRUE);
>         }
>     }
>@@ -844,11 +844,11 @@ add_call_class (GPtrArray *classes,
>     {
>       if (use_allowed)
>         {
>-          g_ptr_array_add (allowed, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO);
>+          g_ptr_array_add (allowed, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO);
>         }
>       else
>         {
>-          tp_asv_set_boolean (fixed, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>+          tp_asv_set_boolean (fixed, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>               TRUE);
>         }
>     }
>@@ -978,14 +978,14 @@ test_supports_ft_props (Test *test,
> {
>   TpCapabilities *caps;
>   GPtrArray *classes;
>-  const gchar * const allow_uri[] = { TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI,
>+  const gchar * const allow_uri[] = { TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI,
>       NULL };
>   const gchar * const allow_desc[] = {
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, NULL };
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION, NULL };
>   const gchar * const allow_date[] = {
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, NULL };
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, NULL };
>   const gchar * const allow_initial_offset[] = {
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, NULL };
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET, NULL };
> 
>   /* TpCapabilities containing no caps */
>   caps = _tp_capabilities_new (NULL, TRUE);
>@@ -1161,7 +1161,7 @@ test_classes_variant (Test *test,
> 
>   g_assert (g_variant_lookup (fixed,
>       TP_PROP_CHANNEL_CHANNEL_TYPE, "&s", &chan_type));
>-  g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
>+  g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
> 
>   g_assert (g_variant_lookup (fixed,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, "u", &handle_type));
>@@ -1170,9 +1170,9 @@ test_classes_variant (Test *test,
>   g_assert_cmpuint (g_variant_n_children (allowed), ==, 2);
>   strv = g_variant_get_strv (allowed, NULL);
>   g_assert (tp_strv_contains ((const gchar * const * ) strv,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME));
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME));
>   g_assert (tp_strv_contains ((const gchar * const * ) strv,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE));
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE));
>   g_free (strv);
> 
>   g_variant_unref (class);
>diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
>index dced5e3..aae03a7 100644
>--- a/tests/dbus/account-channel-request.c
>+++ b/tests/dbus/account-channel-request.c
>@@ -272,13 +272,13 @@ test_handle_create_fail (Test *test,
> 
>   /* The request had the properties we wanted */
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_CALL);
>+        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_CALL1);
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>         TP_PROP_CHANNEL_TARGET_ID), ==, "alice");
>   g_assert_cmpuint (tp_asv_get_uint32 (test->cd_service->last_request,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_HANDLE_TYPE_CONTACT);
>   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL), ==, TRUE);
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL), ==, TRUE);
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>         "com.example.String"), ==, "ferret");
>   g_assert_cmpuint (tp_asv_get_int32 (test->cd_service->last_request,
>@@ -312,11 +312,11 @@ test_handle_proceed_fail (Test *test,
> 
>   /* The request had the properties we wanted */
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_CALL);
>+        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_CALL1);
>   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL), ==, TRUE);
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL), ==, TRUE);
>   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL), ==, TRUE);
>+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL), ==, TRUE);
>   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
>         "ProceedFail", NULL), ==, TRUE);
>   g_assert_cmpuint (tp_asv_size (test->cd_service->last_request), ==, 4);
>@@ -347,14 +347,14 @@ test_handle_cr_failed (Test *test,
> 
>   /* The request had the properties we wanted */
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
>+        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME), ==, "warez.rar");
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME), ==, "warez.rar");
>   g_assert_cmpuint (tp_asv_get_uint64 (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, NULL), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, NULL), ==,
>       G_GUINT64_CONSTANT (1234567890123));
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE), ==,
>       "application/x-rar");
>   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
>         "FireFailed", NULL), ==, TRUE);
>@@ -394,26 +394,26 @@ test_ft_props (Test *test,
> 
>   /* The request had the properties we wanted */
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
>+        TP_PROP_CHANNEL_CHANNEL_TYPE), ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME), ==, "warez.rar");
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME), ==, "warez.rar");
>   g_assert_cmpuint (tp_asv_get_uint64 (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, NULL), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, NULL), ==,
>       G_GUINT64_CONSTANT (1234567890123));
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE), ==,
>       "application/x-rar");
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION), ==,
>       "A collection of l33t warez");
>   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI), ==,
>       "file:///home/Downloads/warez.rar");
>   g_assert_cmpuint (tp_asv_get_uint64 (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, NULL), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_INITIAL_OFFSET, NULL), ==,
>       1024 * 1024);
>   g_assert_cmpuint (tp_asv_get_uint64 (test->cd_service->last_request,
>-        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, NULL), ==,
>+        TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, NULL), ==,
>       1111222233);
>   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
>         "FireFailed", NULL), ==, TRUE);
>diff --git a/tests/dbus/account-request.c b/tests/dbus/account-request.c
>index 0c8a8db..3ec43e9 100644
>--- a/tests/dbus/account-request.c
>+++ b/tests/dbus/account-request.c
>@@ -348,7 +348,7 @@ test_properties (Test *test,
>   g_assert_cmpuint (avatar->len, ==, strlen ("hello world") + 1);
>   g_assert_cmpstr (mime_type, ==, "image/lolz");
> 
>-  v = g_variant_lookup_value (props, TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR,
>+  v = g_variant_lookup_value (props, TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR,
>       NULL);
>   g_assert (v != NULL);
>   g_variant_unref (v);
>@@ -384,7 +384,7 @@ test_properties (Test *test,
>       NULL);
> 
>   v = g_variant_lookup_value (props,
>-      TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER, NULL);
>+      TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_PROVIDER, NULL);
>   g_assert (v != NULL);
>   g_assert_cmpstr (g_variant_get_string (v, NULL), ==, "my.provider");
>   g_variant_unref (v);
>@@ -493,7 +493,7 @@ test_create_succeed (Test *test,
>       "/some/silly/account");
> 
>   array = tp_asv_get_boxed (test->am->create_properties,
>-      TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR,
>+      TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR,
>       TP_STRUCT_TYPE_AVATAR);
>   avatar = g_value_get_boxed (array->values);
>   g_assert_cmpstr (avatar->data, ==, "blue meth");
>diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
>index 765415c..1024462 100644
>--- a/tests/dbus/base-client.c
>+++ b/tests/dbus/base-client.c
>@@ -400,7 +400,7 @@ check_filters (GPtrArray *filters)
>   filter = g_ptr_array_index (filters, 1);
>   g_assert_cmpuint (g_hash_table_size (filter), ==, 2);
>   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   g_assert_cmpuint (tp_asv_get_uint32 (filter,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_HANDLE_TYPE_CONTACT);
> }
>@@ -488,7 +488,7 @@ test_observer (Test *test,
> 
>   tp_base_client_take_observer_filter (test->base_client, tp_asv_new (
>         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_CONTACT,
>         NULL));
>@@ -631,7 +631,7 @@ test_approver (Test *test,
> 
>   tp_base_client_take_approver_filter (test->base_client, tp_asv_new (
>         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_CONTACT,
>         NULL));
>@@ -833,7 +833,7 @@ test_handler (Test *test,
> 
>   tp_base_client_take_handler_filter (test->base_client, tp_asv_new (
>         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_CONTACT,
>         NULL));
>@@ -1012,7 +1012,7 @@ test_handler_requests (Test *test,
> 
>   tp_base_client_take_handler_filter (test->base_client, tp_asv_new (
>         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
>-          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+          TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
>           TP_HANDLE_TYPE_CONTACT,
>         NULL));
>diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c
>index dd5d962..37c8fa0 100644
>--- a/tests/dbus/call-channel.c
>+++ b/tests/dbus/call-channel.c
>@@ -174,12 +174,12 @@ outgoing_call (Test *test,
> {
>   GHashTable *request = tp_asv_new (
>       TP_PROP_CHANNEL_CHANNEL_TYPE,
>-          G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL,
>+          G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
>       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
>       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, id,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>           G_TYPE_BOOLEAN, initial_audio,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>           G_TYPE_BOOLEAN, initial_video,
>       NULL);
> 
>@@ -389,9 +389,9 @@ run_until_active_get_all_cb (TpProxy *proxy,
>           "object-path", object_path,
>           NULL);
>       tp_proxy_add_interface_by_id (endpoint,
>-          TP_IFACE_QUARK_CALL_STREAM_ENDPOINT);
>+          TP_IFACE_QUARK_CALL1_STREAM_ENDPOINT);
> 
>-      tp_cli_call_stream_endpoint_call_set_endpoint_state (endpoint,
>+      tp_cli_call1_stream_endpoint_call_set_endpoint_state (endpoint,
>           -1, TP_STREAM_COMPONENT_DATA,
>           TP_STREAM_ENDPOINT_STATE_FULLY_CONNECTED,
>           NULL, NULL, NULL, NULL);
>@@ -413,10 +413,10 @@ run_until_active_stream_prepared_cb (GObject *stream,
>     }
> 
>   g_assert (tp_proxy_has_interface_by_id (stream,
>-          TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA));
>+          TP_IFACE_QUARK_CALL1_STREAM_INTERFACE_MEDIA));
> 
>   tp_cli_dbus_properties_call_get_all (stream, -1,
>-      TP_IFACE_CALL_STREAM_INTERFACE_MEDIA,
>+      TP_IFACE_CALL1_STREAM_INTERFACE_MEDIA,
>       run_until_active_get_all_cb, test, NULL,
>       NULL);
> }
>@@ -897,7 +897,7 @@ trigger_incoming_call (Test *test,
> {
>   TpProxySignalConnection *new_channels_sig;
> 
>-  tp_cli_connection_interface_presence_run_set_presence (test->conn, -1,
>+  tp_cli_connection_interface_presence1_run_set_presence (test->conn, -1,
>       "away", "preparing for a test", &test->error, NULL);
>   g_assert_no_error (test->error);
> 
>@@ -906,7 +906,7 @@ trigger_incoming_call (Test *test,
>         expect_incoming_call_cb, test, NULL, NULL, &test->error);
>   g_assert_no_error (test->error);
> 
>-  tp_cli_connection_interface_presence_run_set_presence (test->conn, -1,
>+  tp_cli_connection_interface_presence1_run_set_presence (test->conn, -1,
>       "available", message, &test->error, NULL);
>   g_assert_no_error (test->error);
> 
>@@ -1005,12 +1005,12 @@ dtmf_change_requested_cb (TpCallContent *content,
> 
>   if (state == TP_SENDING_STATE_PENDING_SEND)
>     {
>-      tp_cli_call_content_interface_media_call_acknowledge_dtmf_change (content,
>+      tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change (content,
>           -1, event, TP_SENDING_STATE_SENDING, NULL, NULL, NULL, NULL);
>     }
>   else if (state == TP_SENDING_STATE_PENDING_STOP_SENDING)
>     {
>-      tp_cli_call_content_interface_media_call_acknowledge_dtmf_change (content,
>+      tp_cli_call1_content_interface_media_call_acknowledge_dtmf_change (content,
>           -1, event, TP_SENDING_STATE_NONE, NULL, NULL, NULL, NULL);
>     }
> }
>@@ -1030,7 +1030,7 @@ test_dtmf (Test *test,
>   g_assert (contents->len == 1);
>   content = g_ptr_array_index (contents, 0);
> 
>-  tp_cli_call_content_interface_media_connect_to_dtmf_change_requested (content,
>+  tp_cli_call1_content_interface_media_connect_to_dtmf_change_requested (content,
>       dtmf_change_requested_cb, test, NULL, NULL, NULL);
> 
>   tp_call_channel_send_tones_async (test->call_chan, "123456789", NULL,
>diff --git a/tests/dbus/channel-introspect.c b/tests/dbus/channel-introspect.c
>index 6e24089..1b6b525 100644
>--- a/tests/dbus/channel-introspect.c
>+++ b/tests/dbus/channel-introspect.c
>@@ -254,7 +254,7 @@ main (int argc,
> 
>   {
>     const gchar *interfaces[] = {
>-        TP_IFACE_CHANNEL_INTERFACE_GROUP,
>+        TP_IFACE_CHANNEL_INTERFACE_GROUP1,
>         NULL
>     };
> 
>@@ -325,7 +325,7 @@ main (int argc,
> 
>   {
>     const gchar *interfaces[] = {
>-        TP_IFACE_CHANNEL_INTERFACE_GROUP,
>+        TP_IFACE_CHANNEL_INTERFACE_GROUP1,
>         NULL
>     };
> 
>@@ -350,7 +350,7 @@ main (int argc,
>   g_assert (tp_proxy_has_interface_by_id (chan2,
>         TP_IFACE_QUARK_CHANNEL_TYPE_TEXT));
>   g_assert (tp_proxy_has_interface_by_id (chan2,
>-        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP));
>+        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1));
> 
>   g_hash_table_unref (asv);
> 
>diff --git a/tests/dbus/channel.c b/tests/dbus/channel.c
>index 2cfe343..a57733c 100644
>--- a/tests/dbus/channel.c
>+++ b/tests/dbus/channel.c
>@@ -638,7 +638,7 @@ test_contacts (Test *test,
> 
>   handles = g_array_new (FALSE, FALSE, sizeof (TpHandle));
>   g_array_append_val (handles, handle);
>-  tp_cli_channel_interface_group_call_add_members (test->channel_room, -1,
>+  tp_cli_channel_interface_group1_call_add_members (test->channel_room, -1,
>       handles, "hello", NULL, NULL, NULL, NULL);
>   g_array_unref (handles);
> 
>diff --git a/tests/dbus/connection-balance.c b/tests/dbus/connection-balance.c
>index d44a20f..7f1e720 100644
>--- a/tests/dbus/connection-balance.c
>+++ b/tests/dbus/connection-balance.c
>@@ -41,7 +41,7 @@ G_DEFINE_TYPE_WITH_CODE (BalancedConnection,
>     balanced_connection,
>     TP_TESTS_TYPE_CONTACTS_CONNECTION,
> 
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_BALANCE, NULL))
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_BALANCE1, NULL))
> 
> enum
> {
>@@ -90,7 +90,7 @@ get_interfaces (TpBaseConnection *base)
>   interfaces = TP_BASE_CONNECTION_CLASS (
>       balanced_connection_parent_class)->get_interfaces_always_present (base);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CONNECTION_INTERFACE_BALANCE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CONNECTION_INTERFACE_BALANCE1);
> 
>   return interfaces;
> }
>@@ -122,7 +122,7 @@ balanced_connection_class_init (BalancedConnectionClass *cls)
>         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE,
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       balance_props);
> }
>@@ -352,7 +352,7 @@ test_balance (Test *test,
>               G_TYPE_STRING, BALANCE_CURRENCY,
>               G_TYPE_INVALID);
> 
>-  tp_svc_connection_interface_balance_emit_balance_changed (
>+  tp_svc_connection_interface_balance1_emit_balance_changed (
>       test->service_conn_as_base, v);
> 
>   g_signal_connect (test->conn, "balance-changed",
>diff --git a/tests/dbus/connection-interests.c b/tests/dbus/connection-interests.c
>index fa8f491..71eb2e1 100644
>--- a/tests/dbus/connection-interests.c
>+++ b/tests/dbus/connection-interests.c
>@@ -64,7 +64,7 @@ interested_connection_constructed (GObject *object)
>     chain_up (object);
> 
>   tp_base_connection_add_possible_client_interest (base,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION);
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION1);
>   tp_base_connection_add_possible_client_interest (base,
>       g_quark_from_static_string (SUPPORTED_TOKEN));
> }
>@@ -121,7 +121,7 @@ location_interested_cb (TpBaseConnection *unused G_GNUC_UNUSED,
>     const gchar *iface,
>     Test *test)
> {
>-  g_assert_cmpstr (iface, ==, TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+  g_assert_cmpstr (iface, ==, TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
> 
>   g_ptr_array_add (test->log, g_strdup ("Location interested"));
> }
>@@ -139,7 +139,7 @@ location_uninterested_cb (TpBaseConnection *unused G_GNUC_UNUSED,
>     const gchar *iface,
>     Test *test)
> {
>-  g_assert_cmpstr (iface, ==, TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+  g_assert_cmpstr (iface, ==, TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
> 
>   g_ptr_array_add (test->log, g_strdup ("Location uninterested"));
> }
>@@ -209,13 +209,13 @@ setup (Test *test,
>   g_signal_connect (test->service_conn,
>       "clients-interested", G_CALLBACK (interested_cb), test);
>   g_signal_connect (test->service_conn,
>-      "clients-interested::" TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>+      "clients-interested::" TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>       G_CALLBACK (location_interested_cb), test);
> 
>   g_signal_connect (test->service_conn,
>       "clients-uninterested", G_CALLBACK (uninterested_cb), test);
>   g_signal_connect (test->service_conn,
>-      "clients-uninterested::" TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>+      "clients-uninterested::" TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>       G_CALLBACK (location_uninterested_cb), test);
> }
> 
>@@ -267,9 +267,9 @@ test_interested_client (Test *test,
>   guint i;
> 
>   tp_connection_add_client_interest_by_id (test->conn,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION);
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION1);
>   tp_connection_add_client_interest_by_id (test->conn,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS);
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1);
> 
>   /* run until (after) the AddClientInterest calls have gone out */
>   tp_tests_proxy_run_until_dbus_queue_processed (test->client_bus);
>@@ -289,7 +289,7 @@ test_interested_client (Test *test,
>   i = 0;
>   g_assert_cmpuint (test->log->len, >, i);
>   g_assert_cmpstr (g_ptr_array_index (test->log, i), ==,
>-      "interested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+      "interested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
> 
>   i++;
>   g_assert_cmpuint (test->log->len, >, i);
>@@ -299,7 +299,7 @@ test_interested_client (Test *test,
>   i++;
>   g_assert_cmpuint (test->log->len, >, i);
>   g_assert_cmpstr (g_ptr_array_index (test->log, i), ==,
>-      "uninterested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+      "uninterested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
> 
>   i++;
>   g_assert_cmpuint (test->log->len, >, i);
>@@ -315,8 +315,8 @@ test_interest (Test *test,
>     gconstpointer nil G_GNUC_UNUSED)
> {
>   static const gchar * telepathy[] = {
>-      TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+      TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>       NULL
>   };
>   static const gchar * hansard[] = {
>@@ -358,7 +358,7 @@ test_interest (Test *test,
>   i = 0;
>   g_assert_cmpuint (test->log->len, >, i);
>   g_assert_cmpstr (g_ptr_array_index (test->log, i), ==,
>-      "interested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+      "interested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
> 
>   i++;
>   g_assert_cmpuint (test->log->len, >, i);
>@@ -378,7 +378,7 @@ test_interest (Test *test,
>   i++;
>   g_assert_cmpuint (test->log->len, >, i);
>   g_assert_cmpstr (g_ptr_array_index (test->log, i), ==,
>-      "uninterested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION);
>+      "uninterested in " TP_IFACE_CONNECTION_INTERFACE_LOCATION1);
> 
>   i++;
>   g_assert_cmpuint (test->log->len, >, i);
>diff --git a/tests/dbus/contact-lists.c b/tests/dbus/contact-lists.c
>index d8198d4..64a9ec1 100644
>--- a/tests/dbus/contact-lists.c
>+++ b/tests/dbus/contact-lists.c
>@@ -320,22 +320,22 @@ test_connect_and_finish_setup (Test *test)
>   test->log = g_ptr_array_new ();
> 
>   maybe_queue_disconnect (
>-      tp_cli_connection_interface_contact_list_connect_to_contacts_changed (
>+      tp_cli_connection_interface_contact_list1_connect_to_contacts_changed (
>         test->conn, contacts_changed_cb, test, NULL, NULL, NULL));
>   maybe_queue_disconnect (
>-      tp_cli_connection_interface_contact_groups_connect_to_groups_changed (
>+      tp_cli_connection_interface_contact_groups1_connect_to_groups_changed (
>         test->conn, groups_changed_cb, test, NULL, NULL, NULL));
>   maybe_queue_disconnect (
>-      tp_cli_connection_interface_contact_groups_connect_to_groups_created (
>+      tp_cli_connection_interface_contact_groups1_connect_to_groups_created (
>         test->conn, groups_created_cb, test, NULL, NULL, NULL));
>   maybe_queue_disconnect (
>-      tp_cli_connection_interface_contact_groups_connect_to_groups_removed (
>+      tp_cli_connection_interface_contact_groups1_connect_to_groups_removed (
>         test->conn, groups_removed_cb, test, NULL, NULL, NULL));
>   maybe_queue_disconnect (
>-      tp_cli_connection_interface_contact_groups_connect_to_group_renamed (
>+      tp_cli_connection_interface_contact_groups1_connect_to_group_renamed (
>         test->conn, group_renamed_cb, test, NULL, NULL, NULL));
>   maybe_queue_disconnect (
>-      tp_cli_connection_interface_contact_blocking_connect_to_blocked_contacts_changed (
>+      tp_cli_connection_interface_contact_blocking1_connect_to_blocked_contacts_changed (
>         test->conn, blocked_contacts_changed_cb, test, NULL, NULL, NULL));
> 
>   test->sjoerd = tp_handle_ensure (test->contact_repo, "sjoerd@example.com",
>@@ -586,7 +586,7 @@ test_properties (Test *test,
>   gboolean valid;
> 
>   tp_cli_dbus_properties_run_get_all (test->conn, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST, &asv, &error, NULL);
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1, &asv, &error, NULL);
>   g_assert_no_error (error);
>   g_assert_cmpuint (g_hash_table_size (asv), >=, 3);
>   g_assert (tp_asv_get_boolean (asv, "ContactListPersists", NULL));
>@@ -595,7 +595,7 @@ test_properties (Test *test,
>   g_hash_table_unref (asv);
> 
>   tp_cli_dbus_properties_run_get_all (test->conn, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS, &asv, &error, NULL);
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1, &asv, &error, NULL);
>   g_assert_no_error (error);
>   g_assert_cmpuint (g_hash_table_size (asv), >=, 3);
>   g_assert (G_VALUE_HOLDS_BOOLEAN (tp_asv_lookup (asv, "DisjointGroups")));
>@@ -609,7 +609,7 @@ test_properties (Test *test,
>   g_hash_table_unref (asv);
> 
>   tp_cli_dbus_properties_run_get_all (test->conn, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST, &asv, &error, NULL);
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1, &asv, &error, NULL);
>   g_assert_no_error (error);
>   g_assert_cmpuint (g_hash_table_size (asv), >=, 3);
>   g_assert (tp_asv_get_boolean (asv, "ContactListPersists", NULL));
>@@ -618,7 +618,7 @@ test_properties (Test *test,
>   g_hash_table_unref (asv);
> 
>   tp_cli_dbus_properties_run_get_all (test->conn, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS, &asv, &error, NULL);
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1, &asv, &error, NULL);
>   g_assert_no_error (error);
>   g_assert_cmpuint (g_hash_table_size (asv), >=, 3);
>   g_assert (G_VALUE_HOLDS_BOOLEAN (tp_asv_lookup (asv, "DisjointGroups")));
>@@ -631,7 +631,7 @@ test_properties (Test *test,
>   g_hash_table_unref (asv);
> 
>   tp_cli_dbus_properties_run_get_all (test->conn, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING, &asv, &error, NULL);
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1, &asv, &error, NULL);
>   g_assert_no_error (error);
>   g_assert_cmpuint (g_hash_table_size (asv), ==, 1);
>   blocking_caps = tp_asv_get_uint32 (asv, "ContactBlockingCapabilities",
>@@ -674,15 +674,15 @@ test_assert_contact_list_attrs (Test *test,
>       GUINT_TO_POINTER (handle));
>   g_assert (asv != NULL);
>   g_assert_cmpuint (tp_asv_get_uint32 (asv,
>-        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE, &valid), ==,
>+        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_SUBSCRIBE, &valid), ==,
>       expected_sub_state);
>   g_assert (valid);
>   g_assert_cmpuint (tp_asv_get_uint32 (asv,
>-        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH, &valid), ==,
>+        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH, &valid), ==,
>       expected_pub_state);
>   g_assert (valid);
>   g_assert_cmpstr (tp_asv_get_string (asv,
>-        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST), ==,
>+        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST1_PUBLISH_REQUEST), ==,
>       expected_pub_request);
>   g_assert (valid);
> }
>@@ -703,11 +703,11 @@ test_assert_contact_groups_attr (Test *test,
>   g_assert (asv != NULL);
>   tp_asv_dump (asv);
>   g_assert (tp_asv_lookup (asv,
>-        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS) != NULL);
>+        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS) != NULL);
>   g_assert (G_VALUE_HOLDS (tp_asv_lookup (asv,
>-        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS), G_TYPE_STRV));
>+        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS), G_TYPE_STRV));
>   strv = tp_asv_get_strv (asv,
>-        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS);
>+        TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS1_GROUPS);
> 
>   if (group == NULL)
>     {
>@@ -731,8 +731,8 @@ test_assert_contact_state (Test *test,
>     const gchar *expected_group)
> {
>   const gchar *interfaces[] = {
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>       NULL };
>   GArray *handles;
> 
>@@ -760,7 +760,7 @@ test_contacts (Test *test,
> 
>   /* ensure the contact list has been received */
>   tp_cli_dbus_properties_run_get (test->conn, -1,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST, "ContactListState",
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1, "ContactListState",
>       &state, NULL, NULL);
>   g_assert_cmpuint (g_value_get_uint (state), ==, TP_CONTACT_LIST_STATE_SUCCESS);
> 
>@@ -782,10 +782,10 @@ test_contact_list_attrs (Test *test,
>     gconstpointer nil G_GNUC_UNUSED)
> {
>   const gchar *interfaces[] = {
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>       NULL };
> 
>-  tp_cli_connection_interface_contact_list_call_get_contact_list_attributes (
>+  tp_cli_connection_interface_contact_list1_call_get_contact_list_attributes (
>       test->conn, -1, interfaces, contact_attrs_cb, test, test_quit_loop, NULL);
>   g_main_loop_run (test->main_loop);
> 
>@@ -824,7 +824,7 @@ test_assert_contact_blocking_attrs (Test *test,
>   tp_asv_dump (asv);
> 
>   blocked = tp_asv_get_boolean (asv,
>-      TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED, &valid);
>+      TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING1_BLOCKED, &valid);
>   g_assert (valid);
>   g_assert (blocked == expected_blocked);
> }
>@@ -834,7 +834,7 @@ test_contact_blocking_attrs (Test *test,
>     gconstpointer nil G_GNUC_UNUSED)
> {
>   const gchar *interfaces[] = {
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
>       NULL };
>   GArray *handles;
> 
>@@ -864,7 +864,7 @@ test_accept_publish_request (Test *test,
> 
>   g_array_append_val (test->arr, test->wim);
> 
>-  tp_cli_connection_interface_contact_list_run_authorize_publication (
>+  tp_cli_connection_interface_contact_list1_run_authorize_publication (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -893,14 +893,14 @@ test_reject_publish_request (Test *test,
>   if (!tp_strdiff (mode, "unpublish"))
>     {
>       /* directly equivalent, but in practice people won't do this */
>-      tp_cli_connection_interface_contact_list_run_unpublish (
>+      tp_cli_connection_interface_contact_list1_run_unpublish (
>           test->conn, -1, test->arr, &error, NULL);
>     }
>   else
>     {
>       /* this isn't directly equivalent, but in practice it's what people
>        * will do */
>-      tp_cli_connection_interface_contact_list_run_remove_contacts (
>+      tp_cli_connection_interface_contact_list1_run_remove_contacts (
>           test->conn, -1, test->arr, &error, NULL);
>     }
> 
>@@ -935,7 +935,7 @@ test_add_to_publish_pre_approve (Test *test,
>       TP_SUBSCRIPTION_STATE_NO, TP_SUBSCRIPTION_STATE_NO,
>       NULL, NULL);
> 
>-  tp_cli_connection_interface_contact_list_run_authorize_publication (
>+  tp_cli_connection_interface_contact_list1_run_authorize_publication (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -944,7 +944,7 @@ test_add_to_publish_pre_approve (Test *test,
>       NULL, NULL);
> 
>   /* the example CM's fake contacts accept requests that contain "please" */
>-  tp_cli_connection_interface_contact_list_run_request_subscription (
>+  tp_cli_connection_interface_contact_list1_run_request_subscription (
>       test->conn, -1, test->arr, "Please may I see your presence?", &error,
>       NULL);
>   g_assert_no_error (error);
>@@ -990,7 +990,7 @@ test_add_to_publish_no_op (Test *test,
> 
>   g_array_append_val (test->arr, test->sjoerd);
> 
>-  tp_cli_connection_interface_contact_list_run_authorize_publication (
>+  tp_cli_connection_interface_contact_list1_run_authorize_publication (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1011,7 +1011,7 @@ test_remove_from_publish (Test *test,
> 
>   g_array_append_val (test->arr, test->sjoerd);
> 
>-  tp_cli_connection_interface_contact_list_run_unpublish (
>+  tp_cli_connection_interface_contact_list1_run_unpublish (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1043,7 +1043,7 @@ test_remove_from_publish_no_op (Test *test,
> 
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_list_run_unpublish (
>+  tp_cli_connection_interface_contact_list1_run_unpublish (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1065,7 +1065,7 @@ test_cancelled_publish_request (Test *test,
>   /* the example CM's fake contacts accept requests that contain "please" */
>   g_array_append_val (test->arr, test->canceller);
> 
>-  tp_cli_connection_interface_contact_list_run_request_subscription (
>+  tp_cli_connection_interface_contact_list1_run_request_subscription (
>       test->conn, -1, test->arr, "Please may I see your presence?",
>       &error, NULL);
> 
>@@ -1094,10 +1094,10 @@ test_cancelled_publish_request (Test *test,
>   /* We can acknowledge the cancellation with Unpublish() or
>    * RemoveContacts(). */
>   if (!tp_strdiff (mode, "remove-after"))
>-    tp_cli_connection_interface_contact_list_run_remove_contacts (test->conn,
>+    tp_cli_connection_interface_contact_list1_run_remove_contacts (test->conn,
>         -1, test->arr, &error, NULL);
>   else
>-    tp_cli_connection_interface_contact_list_run_unpublish (
>+    tp_cli_connection_interface_contact_list1_run_unpublish (
>         test->conn, -1, test->arr, &error, NULL);
> 
>   while (test->log->len < 1)
>@@ -1124,7 +1124,7 @@ test_add_to_stored (Test *test,
>    * side-effect */
>   g_hash_table_insert (table, GUINT_TO_POINTER (test->ninja),
>       "The Wee Ninja");
>-  tp_cli_connection_interface_aliasing_run_set_aliases (test->conn,
>+  tp_cli_connection_interface_aliasing1_run_set_aliases (test->conn,
>       -1, table, &error, NULL);
>   g_hash_table_unref (table);
> 
>@@ -1154,7 +1154,7 @@ test_add_to_stored_no_op (Test *test,
> 
>   g_hash_table_insert (table, GUINT_TO_POINTER (test->sjoerd),
>       "Sjoerd");
>-  tp_cli_connection_interface_aliasing_run_set_aliases (test->conn,
>+  tp_cli_connection_interface_aliasing1_run_set_aliases (test->conn,
>       -1, table, &error, NULL);
>   g_hash_table_unref (table);
> 
>@@ -1173,7 +1173,7 @@ test_remove_from_stored (Test *test,
> 
>   g_array_append_val (test->arr, test->sjoerd);
> 
>-  tp_cli_connection_interface_contact_list_run_remove_contacts (test->conn,
>+  tp_cli_connection_interface_contact_list1_run_remove_contacts (test->conn,
>       -1, test->arr, &error, NULL);
> 
>   g_assert_no_error (error);
>@@ -1195,7 +1195,7 @@ test_remove_from_stored_no_op (Test *test,
> 
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_list_run_remove_contacts (test->conn,
>+  tp_cli_connection_interface_contact_list1_run_remove_contacts (test->conn,
>       -1, test->arr, &error, NULL);
> 
>   g_assert_no_error (error);
>@@ -1217,7 +1217,7 @@ test_accept_subscribe_request (Test *test,
>   /* the example CM's fake contacts accept requests that contain "please" */
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_list_run_request_subscription (
>+  tp_cli_connection_interface_contact_list1_run_request_subscription (
>       test->conn, -1, test->arr, "Please may I see your presence?",
>       &error, NULL);
>   g_assert_no_error (error);
>@@ -1263,7 +1263,7 @@ test_reject_subscribe_request (Test *test,
>    * "please" */
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_list_run_request_subscription (
>+  tp_cli_connection_interface_contact_list1_run_request_subscription (
>       test->conn, -1, test->arr, "I demand to see your presence?",
>       &error, NULL);
>   g_assert_no_error (error);
>@@ -1291,10 +1291,10 @@ test_reject_subscribe_request (Test *test,
>   /* We can acknowledge the failure to subscribe with Unsubscribe() or
>    * RemoveContacts(). */
>   if (!tp_strdiff (mode, "remove-after"))
>-    tp_cli_connection_interface_contact_list_run_remove_contacts (test->conn,
>+    tp_cli_connection_interface_contact_list1_run_remove_contacts (test->conn,
>         -1, test->arr, &error, NULL);
>   else
>-    tp_cli_connection_interface_contact_list_run_unsubscribe (
>+    tp_cli_connection_interface_contact_list1_run_unsubscribe (
>         test->conn, -1, test->arr, &error, NULL);
> 
>   /* the ninja falls off our subscribe list */
>@@ -1321,7 +1321,7 @@ test_remove_from_subscribe (Test *test,
> 
>   g_array_append_val (test->arr, test->sjoerd);
> 
>-  tp_cli_connection_interface_contact_list_run_unsubscribe (
>+  tp_cli_connection_interface_contact_list1_run_unsubscribe (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1346,7 +1346,7 @@ test_remove_from_subscribe_pending (Test *test,
> 
>   g_array_append_val (test->arr, test->helen);
> 
>-  tp_cli_connection_interface_contact_list_run_unsubscribe (
>+  tp_cli_connection_interface_contact_list1_run_unsubscribe (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1371,7 +1371,7 @@ test_remove_from_subscribe_no_op (Test *test,
> 
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_list_run_unsubscribe (
>+  tp_cli_connection_interface_contact_list1_run_unsubscribe (
>       test->conn, -1, test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1393,7 +1393,7 @@ test_add_to_group (Test *test,
> 
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_groups_run_add_to_group (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_add_to_group (test->conn,
>       -1, "Cambridge", test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1434,7 +1434,7 @@ test_add_to_group_no_op (Test *test,
> 
>   g_array_append_val (test->arr, test->sjoerd);
> 
>-  tp_cli_connection_interface_contact_groups_run_add_to_group (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_add_to_group (test->conn,
>       -1, "Cambridge", test->arr, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1454,7 +1454,7 @@ test_remove_from_group (Test *test,
> 
>   g_array_append_val (test->arr, test->sjoerd);
> 
>-  tp_cli_connection_interface_contact_groups_run_remove_from_group (
>+  tp_cli_connection_interface_contact_groups1_run_remove_from_group (
>       test->conn, -1, "Cambridge", test->arr, &error, NULL);
> 
>   g_assert_no_error (error);
>@@ -1479,7 +1479,7 @@ test_remove_from_group_no_op (Test *test,
> 
>   g_array_append_val (test->arr, test->ninja);
> 
>-  tp_cli_connection_interface_contact_groups_run_remove_from_group (
>+  tp_cli_connection_interface_contact_groups1_run_remove_from_group (
>       test->conn, -1, "Cambridge", test->arr, &error, NULL);
> 
>   g_assert_no_error (error);
>@@ -1496,7 +1496,7 @@ test_remove_group (Test *test,
>   GError *error = NULL;
>   LogEntry *le;
> 
>-  tp_cli_connection_interface_contact_groups_run_remove_group (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_remove_group (test->conn,
>       -1, "Cambridge", &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1526,7 +1526,7 @@ test_set_contact_groups (Test *test,
>   g_array_append_val (test->arr, test->sjoerd);
>   g_array_append_val (test->arr, test->wim);
> 
>-  tp_cli_connection_interface_contact_groups_run_set_contact_groups (
>+  tp_cli_connection_interface_contact_groups1_run_set_contact_groups (
>       test->conn, -1, test->sjoerd, montreal_strv, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1556,7 +1556,7 @@ test_set_contact_groups_no_op (Test *test,
>   test_assert_contact_state (test, test->sjoerd,
>       TP_SUBSCRIPTION_STATE_YES, TP_SUBSCRIPTION_STATE_YES, NULL, "Cambridge");
> 
>-  tp_cli_connection_interface_contact_groups_run_set_contact_groups (
>+  tp_cli_connection_interface_contact_groups1_run_set_contact_groups (
>       test->conn, -1, test->sjoerd, cambridge_strv, &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1584,7 +1584,7 @@ test_set_group_members (Test *test,
>   g_array_append_val (test->arr, test->sjoerd);
>   g_array_append_val (test->arr, test->wim);
> 
>-  tp_cli_connection_interface_contact_groups_run_set_group_members (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_set_group_members (test->conn,
>       -1, "Cambridge", test->arr, &error, NULL);
> 
>   g_assert_no_error (error);
>@@ -1613,7 +1613,7 @@ test_rename_group (Test *test,
>   LogEntry *le;
>   GError *error = NULL;
> 
>-  tp_cli_connection_interface_contact_groups_run_rename_group (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_rename_group (test->conn,
>       -1, "Cambridge", "Grantabrugge", &error, NULL);
>   g_assert_no_error (error);
> 
>@@ -1648,7 +1648,7 @@ test_rename_group_overwrite (Test *test,
> {
>   GError *error = NULL;
> 
>-  tp_cli_connection_interface_contact_groups_run_rename_group (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_rename_group (test->conn,
>       -1, "Cambridge", "Montreal", &error, NULL);
>   g_assert_error (error, TP_ERROR, TP_ERROR_NOT_AVAILABLE);
>   g_assert_cmpuint (test->log->len, ==, 0);
>@@ -1661,7 +1661,7 @@ test_rename_group_absent (Test *test,
> {
>   GError *error = NULL;
> 
>-  tp_cli_connection_interface_contact_groups_run_rename_group (test->conn,
>+  tp_cli_connection_interface_contact_groups1_run_rename_group (test->conn,
>       -1, "Badgers", "Mushrooms", &error, NULL);
>   g_assert_error (error, TP_ERROR, TP_ERROR_DOES_NOT_EXIST);
>   g_assert_cmpuint (test->log->len, ==, 0);
>@@ -1773,7 +1773,7 @@ test_request_blocked_contacts (Test *test,
>   GHashTable *blocked_contacts;
>   GError *error = NULL;
> 
>-  tp_cli_connection_interface_contact_blocking_run_request_blocked_contacts (
>+  tp_cli_connection_interface_contact_blocking1_run_request_blocked_contacts (
>       test->conn, -1, &blocked_contacts, &error, NULL);
>   g_assert_no_error (error);
>   g_assert (blocked_contacts != NULL);
>@@ -1808,7 +1808,7 @@ test_request_blocked_contacts_pre_connect (Test *test,
>   /* This verifies that calling RequestBlockedContacts()
>    * before Connect(), when Connect() ultimately succeeds, returns correctly.
>    */
>-  tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts (
>+  tp_cli_connection_interface_contact_blocking1_call_request_blocked_contacts (
>       test->conn, -1, request_blocked_contacts_succeeded_cb,
>       test, test_quit_loop, NULL);
>   tp_cli_connection_call_connect (test->conn, -1, NULL, NULL, NULL, NULL);
>@@ -1836,10 +1836,10 @@ test_request_blocked_contacts_connect_failed (Test *test,
>    * before Connect(), when Connect() ultimately fails, returns an appropriate
>    * error.
>    */
>-  tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts (
>+  tp_cli_connection_interface_contact_blocking1_call_request_blocked_contacts (
>       test->conn, -1, request_blocked_contacts_failed_cb,
>       test, test_quit_loop, NULL);
>-  tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts (
>+  tp_cli_connection_interface_contact_blocking1_call_request_blocked_contacts (
>       test->conn, -1, request_blocked_contacts_failed_cb,
>       test, test_quit_loop, NULL);
> 
>@@ -1856,7 +1856,7 @@ static void
> call_block_contacts (Test *test,
>     GError **error)
> {
>-  tp_cli_connection_interface_contact_blocking_run_block_contacts (test->conn,
>+  tp_cli_connection_interface_contact_blocking1_run_block_contacts (test->conn,
>       -1, test->arr, FALSE, error, NULL);
> }
> 
>@@ -1878,7 +1878,7 @@ static void
> call_unblock_contacts (Test *test,
>     GError **error)
> {
>-  tp_cli_connection_interface_contact_blocking_run_unblock_contacts (
>+  tp_cli_connection_interface_contact_blocking1_run_unblock_contacts (
>       test->conn, -1, test->arr, error, NULL);
> }
> 
>@@ -1909,7 +1909,7 @@ static void
> test_download_contacts (Test *test,
>     gconstpointer nil G_GNUC_UNUSED)
> {
>-  tp_cli_connection_interface_contact_list_call_download (
>+  tp_cli_connection_interface_contact_list1_call_download (
>     test->conn, -1, download_contacts_cb, test, test_quit_loop, NULL);
> 
>   g_main_loop_run (test->main_loop);
>diff --git a/tests/dbus/contacts-mixin.c b/tests/dbus/contacts-mixin.c
>index 0f410a8..c77b2a9 100644
>--- a/tests/dbus/contacts-mixin.c
>+++ b/tests/dbus/contacts-mixin.c
>@@ -69,9 +69,9 @@ test_features (TpTestsContactsConnection *service_conn,
>                GArray *handles)
> {
>   const gchar *interfaces[] = { TP_IFACE_CONNECTION,
>-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>-      TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>+      TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>       NULL };
>   GError *error = NULL;
>   GHashTable *contacts;
>@@ -93,11 +93,11 @@ test_features (TpTestsContactsConnection *service_conn,
>       "alice");
>   g_assert_cmpstr (
>       tp_asv_get_string (attrs,
>-          TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias"), ==,
>+          TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias"), ==,
>       "Alice in Wonderland");
>   g_assert_cmpstr (
>       tp_asv_get_string (attrs,
>-          TP_IFACE_CONNECTION_INTERFACE_AVATARS "/token"), ==,
>+          TP_IFACE_CONNECTION_INTERFACE_AVATARS1 "/token"), ==,
>       "aaaaa");
> 
>   attrs = g_hash_table_lookup (contacts,
>@@ -108,11 +108,11 @@ test_features (TpTestsContactsConnection *service_conn,
>       "bob");
>   g_assert_cmpstr (
>       tp_asv_get_string (attrs,
>-          TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias"), ==,
>+          TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias"), ==,
>       "Bob the Builder");
>   g_assert_cmpstr (
>       tp_asv_get_string (attrs,
>-          TP_IFACE_CONNECTION_INTERFACE_AVATARS "/token"), ==,
>+          TP_IFACE_CONNECTION_INTERFACE_AVATARS1 "/token"), ==,
>       "bbbbb");
> 
>   attrs = g_hash_table_lookup (contacts,
>@@ -123,11 +123,11 @@ test_features (TpTestsContactsConnection *service_conn,
>       "chris");
>   g_assert_cmpstr (
>       tp_asv_get_string (attrs,
>-          TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias"), ==,
>+          TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias"), ==,
>       "Christopher Robin");
>   g_assert_cmpstr (
>       tp_asv_get_string (attrs,
>-          TP_IFACE_CONNECTION_INTERFACE_AVATARS "/token"), ==,
>+          TP_IFACE_CONNECTION_INTERFACE_AVATARS1 "/token"), ==,
>       "ccccc");
> 
>   g_hash_table_unref (contacts);
>diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c
>index 0ce22f1..922ad7c 100644
>--- a/tests/dbus/contacts.c
>+++ b/tests/dbus/contacts.c
>@@ -574,7 +574,7 @@ test_avatar_data (Fixture *f,
>   g_message (G_STRFUNC);
> 
>   /* Check if AvatarRetrieved gets called */
>-  signal_id = tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (
>+  signal_id = tp_cli_connection_interface_avatars1_connect_to_avatar_retrieved (
>       client_conn, avatar_retrieved_cb, &avatar_retrieved_called, NULL, NULL,
>       &error);
>   g_assert_no_error (error);
>diff --git a/tests/dbus/group-mixin.c b/tests/dbus/group-mixin.c
>index 8827f66..99e1846 100644
>--- a/tests/dbus/group-mixin.c
>+++ b/tests/dbus/group-mixin.c
>@@ -136,7 +136,7 @@ check_initial_properties (void)
>   TpChannelGroupFlags flags;
> 
>   MYASSERT (tp_cli_dbus_properties_run_get_all (chan, -1,
>-      TP_IFACE_CHANNEL_INTERFACE_GROUP, &props, &error, NULL), "");
>+      TP_IFACE_CHANNEL_INTERFACE_GROUP1, &props, &error, NULL), "");
>   g_assert_no_error (error);
> 
>   members = tp_asv_get_boxed (props, "Members", DBUS_TYPE_G_UINT_ARRAY);
>@@ -271,7 +271,7 @@ check_incoming_invitation (void)
> 
>     expect_signals ("", self_handle, TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
>         self_added_to_members);
>-    MYASSERT (tp_cli_channel_interface_group_run_add_members (chan, -1,
>+    MYASSERT (tp_cli_channel_interface_group1_run_add_members (chan, -1,
>         contacts, "", &error, NULL), "");
>     g_assert_no_error (error);
>     wait_for_outstanding_signals ();
>@@ -475,7 +475,7 @@ test_group_mixin (void)
>   GQuark features[] = { TP_CHANNEL_FEATURE_GROUP, 0 };
>   tp_tests_proxy_run_until_prepared (chan, features);
> 
>-  MYASSERT (tp_proxy_has_interface (chan, TP_IFACE_CHANNEL_INTERFACE_GROUP),
>+  MYASSERT (tp_proxy_has_interface (chan, TP_IFACE_CHANNEL_INTERFACE_GROUP1),
>       "");
> 
>   g_signal_connect (chan, "group-members-changed",
>diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c
>index 53098a5..3c88600 100644
>--- a/tests/dbus/message-mixin.c
>+++ b/tests/dbus/message-mixin.c
>@@ -751,7 +751,7 @@ main (int argc,
>       GValue *value = NULL;
>       GPtrArray *channels;
> 
>-      MYASSERT (tp_cli_channel_interface_destroyable_run_destroy (chan,
>+      MYASSERT (tp_cli_channel_interface_destroyable1_run_destroy (chan,
>               -1, &error, NULL), "");
>       g_assert_no_error (error);
>       MYASSERT (tp_proxy_get_invalidated (chan) != NULL, "");
>diff --git a/tests/dbus/protocol-objects.c b/tests/dbus/protocol-objects.c
>index 8a05dee..5ccadfb 100644
>--- a/tests/dbus/protocol-objects.c
>+++ b/tests/dbus/protocol-objects.c
>@@ -95,8 +95,8 @@ const gchar * const expected_interfaces[] = {
>     NULL };
> 
> const gchar * const expected_protocol_interfaces[] = {
>-    TP_IFACE_PROTOCOL_INTERFACE_AVATARS,
>-    TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING,
>+    TP_IFACE_PROTOCOL_INTERFACE_AVATARS1,
>+    TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1,
>     NULL };
> 
> const gchar * const expected_cm_interfaces[] = {
>@@ -183,7 +183,7 @@ test_protocol_avatar_properties (Test *test,
>   g_assert (test->protocol != NULL);
> 
>   tp_cli_dbus_properties_run_get_all (test->protocol, -1,
>-      TP_IFACE_PROTOCOL_INTERFACE_AVATARS, &properties, &test->error, NULL);
>+      TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, &properties, &test->error, NULL);
>   g_assert_no_error (test->error);
> 
>   tp_tests_assert_strv_equals (
>@@ -230,7 +230,7 @@ test_protocol_addressing_properties (Test *test,
>   g_assert (test->protocol != NULL);
> 
>   tp_cli_dbus_properties_run_get_all (test->protocol, -1,
>-      TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING, &properties, &test->error, NULL);
>+      TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1, &properties, &test->error, NULL);
>   g_assert_no_error (test->error);
> 
>   tp_tests_assert_strv_equals (
>@@ -349,7 +349,7 @@ test_protocol_object (Test *test,
>   g_assert (tp_proxy_has_interface_by_id (test->protocol,
>       TP_IFACE_QUARK_PROTOCOL));
>   g_assert (tp_proxy_has_interface_by_id (test->protocol,
>-      TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS));
>+      TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS1));
> 
>   g_assert (tp_proxy_is_prepared (test->protocol,
>         TP_PROTOCOL_FEATURE_PARAMETERS));
>diff --git a/tests/dbus/room-list.c b/tests/dbus/room-list.c
>index 9443741..6ffab36 100644
>--- a/tests/dbus/room-list.c
>+++ b/tests/dbus/room-list.c
>@@ -285,7 +285,7 @@ test_invalidated (Test *test,
>       TP_TESTS_SIMPLE_CONNECTION (test->base_connection), SERVER, NULL);
> 
>   chan = tp_tests_channel_new (test->connection, path,
>-      TP_IFACE_CHANNEL_TYPE_ROOM_LIST, TP_HANDLE_TYPE_NONE, 0,
>+      TP_IFACE_CHANNEL_TYPE_ROOM_LIST1, TP_HANDLE_TYPE_NONE, 0,
>       &test->error);
>   g_assert_no_error (test->error);
> 
>diff --git a/tests/dbus/self-presence.c b/tests/dbus/self-presence.c
>index d91d90b..b82f902 100644
>--- a/tests/dbus/self-presence.c
>+++ b/tests/dbus/self-presence.c
>@@ -34,7 +34,7 @@ test_presence (TpTestsContactsConnection *service_conn,
>   GValueArray *spec;
> 
>   MYASSERT (tp_cli_dbus_properties_run_get (client_conn, -1,
>-        TP_IFACE_CONNECTION_INTERFACE_PRESENCE, "Statuses",
>+        TP_IFACE_CONNECTION_INTERFACE_PRESENCE1, "Statuses",
>         &value, &error, NULL), "");
>   g_assert_no_error (error);
> 
>@@ -86,21 +86,21 @@ test_presence (TpTestsContactsConnection *service_conn,
>   g_value_unset (value);
>   g_free (value);
> 
>-  MYASSERT (!tp_cli_connection_interface_presence_run_set_presence (
>+  MYASSERT (!tp_cli_connection_interface_presence1_run_set_presence (
>         client_conn, -1, "offline", "", &error, NULL), "");
>   g_assert_cmpstr (g_quark_to_string (error->domain), ==,
>       g_quark_to_string (TP_ERROR));
>   g_error_free (error);
>   error = NULL;
> 
>-  MYASSERT (tp_cli_connection_interface_presence_run_set_presence (
>+  MYASSERT (tp_cli_connection_interface_presence1_run_set_presence (
>         client_conn, -1, "available", "Here I am", &error, NULL), "");
>   g_assert_no_error (error);
> 
>   value = NULL;
> 
>   MYASSERT (tp_cli_dbus_properties_run_get (client_conn, -1,
>-        TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>+        TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>         "MaximumStatusMessageLength",
>         &value, &error, NULL), "");
>   g_assert_no_error (error);
>@@ -162,15 +162,15 @@ main (int argc,
>   g_assert_no_error (error);
>   interfaces = g_value_get_boxed (value);
>   MYASSERT (tp_strv_contains ((const gchar * const *) interfaces,
>-      TP_IFACE_CONNECTION_INTERFACE_ALIASING), "");
>+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1), "");
>   MYASSERT (tp_strv_contains ((const gchar * const *) interfaces,
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS), "");
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1), "");
>   MYASSERT (tp_strv_contains ((const gchar * const *) interfaces,
>       TP_IFACE_CONNECTION_INTERFACE_CONTACTS), "");
>   MYASSERT (tp_strv_contains ((const gchar * const *) interfaces,
>-      TP_IFACE_CONNECTION_INTERFACE_PRESENCE), "");
>+      TP_IFACE_CONNECTION_INTERFACE_PRESENCE1), "");
>   MYASSERT (tp_strv_contains ((const gchar * const *) interfaces,
>-      TP_IFACE_CONNECTION_INTERFACE_PRESENCE), "");
>+      TP_IFACE_CONNECTION_INTERFACE_PRESENCE1), "");
>   g_value_unset (value);
>   tp_clear_pointer (&value, g_free);
> 
>diff --git a/tests/dbus/simple-approver.c b/tests/dbus/simple-approver.c
>index 3b65812..2f9bf31 100644
>--- a/tests/dbus/simple-approver.c
>+++ b/tests/dbus/simple-approver.c
>@@ -229,7 +229,7 @@ check_filters (GPtrArray *filters)
>   filter = g_ptr_array_index (filters, 1);
>   g_assert_cmpuint (g_hash_table_size (filter), ==, 2);
>   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   g_assert_cmpuint (tp_asv_get_uint32 (filter,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_HANDLE_TYPE_CONTACT);
> }
>@@ -285,7 +285,7 @@ test_properties (Test *test,
> 
>   tp_base_client_add_approver_filter_vardict (test->simple_approver,
>       g_variant_new_parsed ("{ %s: <%s>, %s: <%u> }",
>-        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_HANDLE_TYPE_CONTACT));
> 
>   tp_base_client_register (test->simple_approver, &test->error);
>diff --git a/tests/dbus/simple-handler.c b/tests/dbus/simple-handler.c
>index 268a6b8..46434a9 100644
>--- a/tests/dbus/simple-handler.c
>+++ b/tests/dbus/simple-handler.c
>@@ -233,7 +233,7 @@ check_filters (GPtrArray *filters)
>   filter = g_ptr_array_index (filters, 1);
>   g_assert_cmpuint (g_hash_table_size (filter), ==, 2);
>   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   g_assert_cmpuint (tp_asv_get_uint32 (filter,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_HANDLE_TYPE_CONTACT);
> }
>@@ -306,7 +306,7 @@ test_properties (Test *test,
> 
>   tp_base_client_add_handler_filter_vardict (test->simple_handler,
>       g_variant_new_parsed ("{ %s: <%s>, %s: <%u> }",
>-        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_HANDLE_TYPE_CONTACT));
> 
>   tp_base_client_register (test->simple_handler, &test->error);
>diff --git a/tests/dbus/simple-observer.c b/tests/dbus/simple-observer.c
>index bb264ae..c499cce 100644
>--- a/tests/dbus/simple-observer.c
>+++ b/tests/dbus/simple-observer.c
>@@ -205,7 +205,7 @@ check_filters (GPtrArray *filters)
>   filter = g_ptr_array_index (filters, 1);
>   g_assert_cmpuint (g_hash_table_size (filter), ==, 2);
>   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   g_assert_cmpuint (tp_asv_get_uint32 (filter,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_HANDLE_TYPE_CONTACT);
> }
>@@ -273,7 +273,7 @@ test_properties (Test *test,
> 
>   tp_base_client_add_observer_filter_vardict (test->simple_observer,
>       g_variant_new_parsed ("{ %s: <%s>, %s: <%u> }",
>-        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_HANDLE_TYPE_CONTACT));
> 
>   tp_base_client_register (test->simple_observer, &test->error);
>diff --git a/tests/dbus/text-respawn.c b/tests/dbus/text-respawn.c
>index 0df5efa..ccbccd1 100644
>--- a/tests/dbus/text-respawn.c
>+++ b/tests/dbus/text-respawn.c
>@@ -303,7 +303,7 @@ main (int argc,
>     {
>       gboolean dead;
> 
>-      MYASSERT (tp_cli_channel_interface_destroyable_run_destroy (chan, -1,
>+      MYASSERT (tp_cli_channel_interface_destroyable1_run_destroy (chan, -1,
>             &error, NULL), "");
>       g_assert_no_error (error);
>       MYASSERT (tp_proxy_get_invalidated (chan) != NULL, "");
>diff --git a/tests/dbus/unsupported-interface.c b/tests/dbus/unsupported-interface.c
>index 36a00e0..2d65378 100644
>--- a/tests/dbus/unsupported-interface.c
>+++ b/tests/dbus/unsupported-interface.c
>@@ -80,7 +80,7 @@ test_unsupported_run (Fixture *f,
> {
>   gboolean ok;
> 
>-  ok = tp_cli_connection_interface_mail_notification_run_request_inbox_url (
>+  ok = tp_cli_connection_interface_mail_notification1_run_request_inbox_url (
>       f->conn, -1, NULL /* "out" arg */, &f->error, NULL);
>   g_assert_error (f->error, TP_DBUS_ERRORS, TP_DBUS_ERROR_NO_INTERFACE);
>   g_assert (!ok);
>@@ -162,7 +162,7 @@ test_unsupported_async (Fixture *f,
> 
>   f->reentrant = TRUE;
>   f->wait = 1;
>-  call = tp_cli_connection_interface_mail_notification_call_request_inbox_url (
>+  call = tp_cli_connection_interface_mail_notification1_call_request_inbox_url (
>       f->conn, -1, inbox_url_cb, f, pretend_to_free, NULL);
>   f->reentrant = FALSE;
> 
>@@ -206,7 +206,7 @@ test_unsupported_signal (Fixture *f,
> {
>   TpProxySignalConnection *sc;
> 
>-  sc = tp_cli_connection_interface_mail_notification_connect_to_mails_received (
>+  sc = tp_cli_connection_interface_mail_notification1_connect_to_mails_received (
>       f->conn,
>       (void (*)(TpConnection *, const GPtrArray *, gpointer, GObject *)) do_nothing,
>       f, pretend_to_free, NULL, &f->error);
>diff --git a/tests/lib/broken-client-types-conn.c b/tests/lib/broken-client-types-conn.c
>index 07de67c..1829869 100644
>--- a/tests/lib/broken-client-types-conn.c
>+++ b/tests/lib/broken-client-types-conn.c
>@@ -19,7 +19,7 @@
> G_DEFINE_TYPE_WITH_CODE (TpTestsBrokenClientTypesConnection,
>     tp_tests_broken_client_types_connection,
>     TP_TESTS_TYPE_CONTACTS_CONNECTION,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1,
>         NULL);
>     );
> 
>@@ -52,7 +52,7 @@ broken_fill_client_types (
> 
>       tp_contacts_mixin_set_contact_attribute (attributes,
>           handle,
>-          TP_TOKEN_CONNECTION_INTERFACE_PRESENCE_PRESENCE,
>+          TP_TOKEN_CONNECTION_INTERFACE_PRESENCE1_PRESENCE,
>           tp_g_value_slice_new_take_boxed (type, presence));
>     }
> }
>diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c
>index 6e7c39c..5ebc35f 100644
>--- a/tests/lib/contacts-conn.c
>+++ b/tests/lib/contacts-conn.c
>@@ -29,24 +29,24 @@ static void conn_avatars_properties_getter (GObject *object, GQuark interface,
> G_DEFINE_TYPE_WITH_CODE (TpTestsContactsConnection,
>     tp_tests_contacts_connection,
>     TP_TESTS_TYPE_SIMPLE_CONNECTION,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1,
>       init_aliasing);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS1,
>       init_avatars);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
>       tp_presence_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION, NULL)
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION1, NULL)
>     G_IMPLEMENT_INTERFACE (
>-      TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, NULL)
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO,
>+      TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1, NULL)
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO1,
>       init_contact_info)
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
>       tp_contacts_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1,
>       tp_base_contact_list_mixin_list_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>       tp_base_contact_list_mixin_groups_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1,
>       NULL);
>     );
> 
>@@ -199,7 +199,7 @@ aliasing_fill_contact_attributes (GObject *object,
>         }
> 
>       tp_contacts_mixin_set_contact_attribute (attributes, handle,
>-          TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias",
>+          TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias",
>           tp_g_value_slice_new_string (alias));
>     }
> }
>@@ -221,7 +221,7 @@ avatars_fill_contact_attributes (GObject *object,
>       if (a != NULL && a->token != NULL)
>         {
>           tp_contacts_mixin_set_contact_attribute (attributes, handle,
>-              TP_IFACE_CONNECTION_INTERFACE_AVATARS "/token",
>+              TP_IFACE_CONNECTION_INTERFACE_AVATARS1 "/token",
>               tp_g_value_slice_new_string (a->token));
>         }
>     }
>@@ -244,7 +244,7 @@ location_fill_contact_attributes (GObject *object,
>       if (location != NULL)
>         {
>           tp_contacts_mixin_set_contact_attribute (attributes, handle,
>-              TP_IFACE_CONNECTION_INTERFACE_LOCATION "/location",
>+              TP_IFACE_CONNECTION_INTERFACE_LOCATION1 "/location",
>               tp_g_value_slice_new_boxed (TP_HASH_TYPE_LOCATION, location));
>         }
>     }
>@@ -267,7 +267,7 @@ contact_caps_fill_contact_attributes (GObject *object,
>       if (caps != NULL)
>         {
>           tp_contacts_mixin_set_contact_attribute (attributes, handle,
>-              TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES "/capabilities",
>+              TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1 "/capabilities",
>               tp_g_value_slice_new_boxed (
>                 TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST, caps));
>         }
>@@ -291,7 +291,7 @@ contact_info_fill_contact_attributes (GObject *object,
>       if (info != NULL)
>         {
>           tp_contacts_mixin_set_contact_attribute (attributes, handle,
>-              TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO "/info",
>+              TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1 "/info",
>               tp_g_value_slice_new_boxed (TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST,
>                   info));
>         }
>@@ -404,22 +404,22 @@ constructed (GObject *object)
>           TP_BASE_CONTACT_LIST (self->priv->list_manager), base);
>     }
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>       aliasing_fill_contact_attributes);
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>       avatars_fill_contact_attributes);
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>+      TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>       location_fill_contact_attributes);
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
>       contact_caps_fill_contact_attributes);
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>       contact_info_fill_contact_attributes);
>   tp_contacts_mixin_add_contact_attributes_iface (object,
>-      TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES,
>+      TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1,
>       client_types_fill_contact_attributes);
> 
>   tp_presence_mixin_init (object,
>@@ -532,16 +532,16 @@ tp_tests_contacts_get_interfaces_always_present (TpBaseConnection *base)
> {
>   GPtrArray *interfaces;
>   static const gchar *interfaces_always_present[] = {
>-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>       TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>-      TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>-      TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>-      TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>+      TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>+      TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>+      TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>       NULL };
>   guint i;
> 
>@@ -589,17 +589,17 @@ tp_tests_contacts_connection_class_init (TpTestsContactsConnectionClass *klass)
>     { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-        { TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+        { TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>           conn_avatars_properties_getter,
>           NULL,
>           conn_avatars_properties,
>         },
>-        { TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+        { TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>           conn_contact_info_properties_getter,
>           NULL,
>           conn_contact_info_properties,
>         },
>-        { TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+        { TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>           aliasing_get_dbus_property,
>           NULL,
>           aliasing_props,
>@@ -669,7 +669,7 @@ tp_tests_contacts_connection_change_aliases (TpTestsContactsConnection *self,
>           GUINT_TO_POINTER (handles[i]), (gchar *) aliases[i]);
>     }
> 
>-  tp_svc_connection_interface_aliasing_emit_aliases_changed (self, changes);
>+  tp_svc_connection_interface_aliasing1_emit_aliases_changed (self, changes);
> 
>   g_hash_table_unref (changes);
> }
>@@ -729,7 +729,7 @@ tp_tests_contacts_connection_change_avatar_tokens (TpTestsContactsConnection *se
>       DEBUG ("contact#%u -> %s", handles[i], tokens[i]);
>       g_hash_table_insert (self->priv->avatars,
>           GUINT_TO_POINTER (handles[i]), avatar_data_new (NULL, NULL, tokens[i]));
>-      tp_svc_connection_interface_avatars_emit_avatar_updated (self,
>+      tp_svc_connection_interface_avatars1_emit_avatar_updated (self,
>           handles[i], tokens[i]);
>     }
> }
>@@ -745,7 +745,7 @@ tp_tests_contacts_connection_change_avatar_data (
>   g_hash_table_insert (self->priv->avatars,
>       GUINT_TO_POINTER (handle), avatar_data_new (data, mime_type, token));
> 
>-  tp_svc_connection_interface_avatars_emit_avatar_updated (self,
>+  tp_svc_connection_interface_avatars1_emit_avatar_updated (self,
>       handle, token);
> }
> 
>@@ -764,7 +764,7 @@ tp_tests_contacts_connection_change_locations (TpTestsContactsConnection *self,
>       g_hash_table_insert (self->priv->locations,
>           GUINT_TO_POINTER (handles[i]), g_hash_table_ref (locations[i]));
> 
>-      tp_svc_connection_interface_location_emit_location_updated (self,
>+      tp_svc_connection_interface_location1_emit_location_updated (self,
>           handles[i], locations[i]);
>     }
> }
>@@ -786,7 +786,7 @@ tp_tests_contacts_connection_change_capabilities (
>             caps));
>     }
> 
>-  tp_svc_connection_interface_contact_capabilities_emit_contact_capabilities_changed (
>+  tp_svc_connection_interface_contact_capabilities1_emit_contact_capabilities_changed (
>       self, capabilities);
> }
> 
>@@ -799,7 +799,7 @@ tp_tests_contacts_connection_change_contact_info (
>   g_hash_table_insert (self->priv->contact_info, GUINT_TO_POINTER (handle),
>       g_ptr_array_ref (info));
> 
>-  tp_svc_connection_interface_contact_info_emit_contact_info_changed (self,
>+  tp_svc_connection_interface_contact_info1_emit_contact_info_changed (self,
>       handle, info);
> }
> 
>@@ -814,7 +814,7 @@ tp_tests_contacts_connection_set_default_contact_info (
> }
> 
> static void
>-my_request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
>+my_request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
>                     const GArray *contacts,
>                     DBusGMethodInvocation *context)
> {
>@@ -853,13 +853,13 @@ my_request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
> 
>   g_ptr_array_add (result, NULL);
>   strings = (gchar **) g_ptr_array_free (result, FALSE);
>-  tp_svc_connection_interface_aliasing_return_from_request_aliases (context,
>+  tp_svc_connection_interface_aliasing1_return_from_request_aliases (context,
>       (const gchar **) strings);
>   g_free (strings);
> }
> 
> static void
>-my_set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
>+my_set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
>     GHashTable *table,
>     DBusGMethodInvocation *context)
> {
>@@ -902,7 +902,7 @@ my_set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
>       (const TpHandle *) handles->data,
>       (const gchar * const *) aliases->pdata);
> 
>-  tp_svc_connection_interface_aliasing_return_from_set_aliases (context);
>+  tp_svc_connection_interface_aliasing1_return_from_set_aliases (context);
> 
> out:
>   g_array_unref (handles);
>@@ -913,9 +913,9 @@ static void
> init_aliasing (gpointer g_iface,
>                gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceAliasingClass *klass = g_iface;
>+  TpSvcConnectionInterfaceAliasing1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_aliasing_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_aliasing1_implement_##x (\
>     klass, my_##x)
>   IMPLEMENT(request_aliases);
>   IMPLEMENT(set_aliases);
>@@ -923,7 +923,7 @@ init_aliasing (gpointer g_iface,
> }
> 
> static void
>-my_request_avatars (TpSvcConnectionInterfaceAvatars *avatars,
>+my_request_avatars (TpSvcConnectionInterfaceAvatars1 *avatars,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
> {
>@@ -950,11 +950,11 @@ my_request_avatars (TpSvcConnectionInterfaceAvatars *avatars,
>           GUINT_TO_POINTER (handle));
> 
>       if (a != NULL)
>-        tp_svc_connection_interface_avatars_emit_avatar_retrieved (self, handle,
>+        tp_svc_connection_interface_avatars1_emit_avatar_retrieved (self, handle,
>             a->token, a->data, a->mime_type);
>     }
> 
>-  tp_svc_connection_interface_avatars_return_from_request_avatars (context);
>+  tp_svc_connection_interface_avatars1_return_from_request_avatars (context);
> }
> 
> static void
>@@ -981,9 +981,9 @@ static void
> init_avatars (gpointer g_iface,
>               gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceAvatarsClass *klass = g_iface;
>+  TpSvcConnectionInterfaceAvatars1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_avatars_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_avatars1_implement_##x (\
>     klass, my_##x)
>   /* IMPLEMENT(get_avatar_requirements); */
>   /* IMPLEMENT(request_avatar); */
>@@ -1014,7 +1014,7 @@ lookup_contact_info (TpTestsContactsConnection *self,
> }
> 
> static void
>-my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *obj,
>+my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
>     const GArray *contacts,
>     DBusGMethodInvocation *context)
> {
>@@ -1039,17 +1039,17 @@ my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *obj,
>       TpHandle handle = g_array_index (contacts, guint, i);
>       GPtrArray *arr = lookup_contact_info (self, handle);
> 
>-      tp_svc_connection_interface_contact_info_emit_contact_info_changed (self,
>+      tp_svc_connection_interface_contact_info1_emit_contact_info_changed (self,
>           handle, arr);
>       g_ptr_array_unref (arr);
>     }
> 
>-  tp_svc_connection_interface_contact_info_return_from_refresh_contact_info (
>+  tp_svc_connection_interface_contact_info1_return_from_refresh_contact_info (
>       context);
> }
> 
> static void
>-my_request_contact_info (TpSvcConnectionInterfaceContactInfo *obj,
>+my_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
>     guint handle,
>     DBusGMethodInvocation *context)
> {
>@@ -1071,14 +1071,14 @@ my_request_contact_info (TpSvcConnectionInterfaceContactInfo *obj,
> 
>   ret = lookup_contact_info (self, handle);
> 
>-  tp_svc_connection_interface_contact_info_return_from_request_contact_info (
>+  tp_svc_connection_interface_contact_info1_return_from_request_contact_info (
>       context, ret);
> 
>   g_ptr_array_unref (ret);
> }
> 
> static void
>-my_set_contact_info (TpSvcConnectionInterfaceContactInfo *obj,
>+my_set_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj,
>     const GPtrArray *info,
>     DBusGMethodInvocation *context)
> {
>@@ -1101,7 +1101,7 @@ my_set_contact_info (TpSvcConnectionInterfaceContactInfo *obj,
>   tp_tests_contacts_connection_change_contact_info (self, self_handle, copy);
>   g_ptr_array_unref (copy);
> 
>-  tp_svc_connection_interface_contact_info_return_from_set_contact_info (
>+  tp_svc_connection_interface_contact_info1_return_from_set_contact_info (
>       context);
> }
> 
>@@ -1109,9 +1109,9 @@ static void
> init_contact_info (gpointer g_iface,
>     gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceContactInfoClass *klass = g_iface;
>+  TpSvcConnectionInterfaceContactInfo1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_contact_info_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_contact_info1_implement_##x (\
>     klass, my_##x)
>   IMPLEMENT (refresh_contact_info);
>   IMPLEMENT (request_contact_info);
>diff --git a/tests/lib/dbus-tube-chan.c b/tests/lib/dbus-tube-chan.c
>index 28e34b5..3a67b0f 100644
>--- a/tests/lib/dbus-tube-chan.c
>+++ b/tests/lib/dbus-tube-chan.c
>@@ -107,9 +107,9 @@ static void dbus_tube_iface_init (gpointer iface, gpointer data);
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpTestsDBusTubeChannel,
>     tp_tests_dbus_tube_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE1,
>       dbus_tube_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE1,
>       NULL);
>     )
> 
>@@ -123,7 +123,7 @@ tp_tests_dbus_tube_channel_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       tp_tests_dbus_tube_channel_parent_class)->get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE1);
>   return interfaces;
> };
> 
>@@ -200,8 +200,8 @@ fill_immutable_properties (TpBaseChannel *chan,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, "ServiceName",
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, "SupportedAccessControls",
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1, "ServiceName",
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1, "SupportedAccessControls",
>       NULL);
> 
>   if (!tp_base_channel_is_requested (chan))
>@@ -209,7 +209,7 @@ fill_immutable_properties (TpBaseChannel *chan,
>       /* Parameters is immutable only for incoming tubes */
>       tp_dbus_properties_mixin_fill_properties_hash (
>           G_OBJECT (chan), properties,
>-          TP_IFACE_CHANNEL_INTERFACE_TUBE, "Parameters",
>+          TP_IFACE_CHANNEL_INTERFACE_TUBE1, "Parameters",
>           NULL);
>     }
> }
>@@ -236,7 +236,7 @@ tp_tests_dbus_tube_channel_class_init (TpTestsDBusTubeChannelClass *klass)
>   object_class->get_property = tp_tests_dbus_tube_channel_get_property;
>   object_class->dispose = dispose;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_DBUS_TUBE;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1;
>   base_class->get_interfaces = tp_tests_dbus_tube_channel_get_interfaces;
>   base_class->close = channel_close;
>   base_class->fill_immutable_properties = fill_immutable_properties;
>@@ -289,12 +289,12 @@ tp_tests_dbus_tube_channel_class_init (TpTestsDBusTubeChannelClass *klass)
>       1, G_TYPE_DBUS_CONNECTION);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       dbus_tube_props);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       tube_props);
> 
>@@ -308,7 +308,7 @@ change_state (TpTestsDBusTubeChannel *self,
> {
>   self->priv->state = state;
> 
>-  tp_svc_channel_interface_tube_emit_tube_channel_state_changed (self, state);
>+  tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (self, state);
> }
> 
> static gboolean
>@@ -350,7 +350,7 @@ really_open_tube (TpTestsDBusTubeChannel *self)
> }
> 
> static void
>-dbus_tube_offer (TpSvcChannelTypeDBusTube *chan,
>+dbus_tube_offer (TpSvcChannelTypeDBusTube1 *chan,
>     GHashTable *parameters,
>     guint access_control,
>     DBusGMethodInvocation *context)
>@@ -362,7 +362,7 @@ dbus_tube_offer (TpSvcChannelTypeDBusTube *chan,
>   if (self->priv->open_mode == TP_TESTS_DBUS_TUBE_CHANNEL_OPEN_FIRST)
>     really_open_tube (self);
> 
>-  tp_svc_channel_type_dbus_tube_return_from_offer (context,
>+  tp_svc_channel_type_dbus_tube1_return_from_offer (context,
>       g_dbus_server_get_client_address (self->priv->dbus_server));
> 
>   if (self->priv->open_mode == TP_TESTS_DBUS_TUBE_CHANNEL_OPEN_SECOND)
>@@ -372,7 +372,7 @@ dbus_tube_offer (TpSvcChannelTypeDBusTube *chan,
> }
> 
> static void
>-dbus_tube_accept (TpSvcChannelTypeDBusTube *chan,
>+dbus_tube_accept (TpSvcChannelTypeDBusTube1 *chan,
>     guint access_control,
>     DBusGMethodInvocation *context)
> {
>@@ -383,7 +383,7 @@ dbus_tube_accept (TpSvcChannelTypeDBusTube *chan,
>   if (self->priv->open_mode == TP_TESTS_DBUS_TUBE_CHANNEL_OPEN_FIRST)
>     really_open_tube (self);
> 
>-  tp_svc_channel_type_dbus_tube_return_from_accept (context,
>+  tp_svc_channel_type_dbus_tube1_return_from_accept (context,
>       g_dbus_server_get_client_address (self->priv->dbus_server));
> 
>   if (self->priv->open_mode == TP_TESTS_DBUS_TUBE_CHANNEL_OPEN_SECOND)
>@@ -404,9 +404,9 @@ static void
> dbus_tube_iface_init (gpointer iface,
>     gpointer data)
> {
>-  TpSvcChannelTypeDBusTubeClass *klass = iface;
>+  TpSvcChannelTypeDBusTube1Class *klass = iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_type_dbus_tube_implement_##x (klass, dbus_tube_##x)
>+#define IMPLEMENT(x) tp_svc_channel_type_dbus_tube1_implement_##x (klass, dbus_tube_##x)
>   IMPLEMENT (offer);
>   IMPLEMENT (accept);
> #undef IMPLEMENT
>diff --git a/tests/lib/echo-chan.c b/tests/lib/echo-chan.c
>index 868fbcf..9234a6a 100644
>--- a/tests/lib/echo-chan.c
>+++ b/tests/lib/echo-chan.c
>@@ -25,7 +25,7 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsEchoChannel,
>     TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
>       tp_message_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1,
>       destroyable_iface_init);
>     )
> 
>@@ -39,7 +39,7 @@ tp_tests_echo_channel_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (tp_tests_echo_channel_parent_class)->
>     get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1);
>   return interfaces;
> };
> 
>@@ -199,7 +199,7 @@ text_send (GObject *object,
> }
> 
> static void
>-destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface,
>+destroyable_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
>                      DBusGMethodInvocation *context)
> {
>   TpTestsEchoChannel *self = TP_TESTS_ECHO_CHANNEL (iface);
>@@ -207,17 +207,17 @@ destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface,
>   tp_message_mixin_clear ((GObject *) self);
>   tp_base_channel_destroyed (TP_BASE_CHANNEL (self));
> 
>-  tp_svc_channel_interface_destroyable_return_from_destroy (context);
>+  tp_svc_channel_interface_destroyable1_return_from_destroy (context);
> }
> 
> static void
> destroyable_iface_init (gpointer iface,
>                         gpointer data)
> {
>-  TpSvcChannelInterfaceDestroyableClass *klass = iface;
>+  TpSvcChannelInterfaceDestroyable1Class *klass = iface;
> 
> #define IMPLEMENT(x) \
>-  tp_svc_channel_interface_destroyable_implement_##x (klass, destroyable_##x)
>+  tp_svc_channel_interface_destroyable1_implement_##x (klass, destroyable_##x)
>   IMPLEMENT (destroy);
> #undef IMPLEMENT
> }
>diff --git a/tests/lib/file-transfer-chan.c b/tests/lib/file-transfer-chan.c
>index 92520f4..3bc8d89 100644
>--- a/tests/lib/file-transfer-chan.c
>+++ b/tests/lib/file-transfer-chan.c
>@@ -25,9 +25,9 @@ static void file_transfer_iface_init (gpointer iface, gpointer data);
> G_DEFINE_TYPE_WITH_CODE (TpTestsFileTransferChannel,
>     tp_tests_file_transfer_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER1,
>       file_transfer_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1,
>       NULL);
>     )
> 
>@@ -328,14 +328,14 @@ fill_immutable_properties (TpBaseChannel *self,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (self), properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentType",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Filename",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Size",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Description",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Date",
>-      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "ServiceName",
>-      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "Metadata",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "AvailableSocketTypes",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "ContentType",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "Filename",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "Size",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "Description",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "Date",
>+      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1, "ServiceName",
>+      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1, "Metadata",
>       NULL);
> 
>   /* URI is immutable only for outgoing transfers */
>@@ -343,7 +343,7 @@ fill_immutable_properties (TpBaseChannel *self,
>     {
>       tp_dbus_properties_mixin_fill_properties_hash (G_OBJECT (self),
>           properties,
>-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "URI", NULL);
>+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "URI", NULL);
>     }
> }
> 
>@@ -354,7 +354,7 @@ change_state (TpTestsFileTransferChannel *self,
> {
>   self->priv->state = state;
> 
>-  tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed (self,
>+  tp_svc_channel_type_file_transfer1_emit_file_transfer_state_changed (self,
>       state, reason);
> }
> 
>@@ -444,7 +444,7 @@ service_incoming_cb (GSocketService *service,
> }
> 
> static void
>-file_transfer_provide_file (TpSvcChannelTypeFileTransfer *iface,
>+file_transfer_provide_file (TpSvcChannelTypeFileTransfer1 *iface,
>     TpSocketAddressType address_type,
>     TpSocketAccessControl access_control,
>     const GValue *access_control_param,
>@@ -506,7 +506,7 @@ file_transfer_provide_file (TpSvcChannelTypeFileTransfer *iface,
>   // then close the socket
>   // g_output_stream_write_async
> 
>-  tp_svc_channel_type_file_transfer_return_from_provide_file (context,
>+  tp_svc_channel_type_file_transfer1_return_from_provide_file (context,
>       self->priv->address);
> 
>   return;
>@@ -517,7 +517,7 @@ fail:
> }
> 
> static void
>-file_transfer_accept_file (TpSvcChannelTypeFileTransfer *iface,
>+file_transfer_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
>     TpSocketAddressType address_type,
>     TpSocketAccessControl access_control,
>     const GValue *access_control_param,
>@@ -569,7 +569,7 @@ file_transfer_accept_file (TpSvcChannelTypeFileTransfer *iface,
>   DEBUG ("Waiting 500ms and setting state to OPEN");
>   self->priv->timer_id = g_timeout_add (500, start_file_transfer, self);
> 
>-  tp_svc_channel_type_file_transfer_return_from_accept_file (context,
>+  tp_svc_channel_type_file_transfer1_return_from_accept_file (context,
>       address);
> 
>   tp_clear_pointer (&address, tp_g_value_slice_free);
>@@ -613,7 +613,7 @@ tp_tests_file_transfer_channel_class_init (
>   object_class->set_property = set_property;
>   object_class->dispose = dispose;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1;
>   base_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
> 
>   base_class->close = channel_close;
>@@ -716,12 +716,12 @@ tp_tests_file_transfer_channel_class_init (
>       param_spec);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       file_transfer_props);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       metadata_props);
> 
>@@ -732,9 +732,9 @@ tp_tests_file_transfer_channel_class_init (
> static void
> file_transfer_iface_init (gpointer iface, gpointer data)
> {
>-  TpSvcChannelTypeFileTransferClass *klass = iface;
>+  TpSvcChannelTypeFileTransfer1Class *klass = iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_type_file_transfer_implement_##x (klass, \
>+#define IMPLEMENT(x) tp_svc_channel_type_file_transfer1_implement_##x (klass, \
>     file_transfer_##x)
>   IMPLEMENT(accept_file);
>   IMPLEMENT(provide_file);
>diff --git a/tests/lib/room-list-chan.c b/tests/lib/room-list-chan.c
>index a94133d..a3a7a8c 100644
>--- a/tests/lib/room-list-chan.c
>+++ b/tests/lib/room-list-chan.c
>@@ -10,7 +10,7 @@ static void room_list_iface_init (gpointer iface,
>     gpointer data);
> 
> G_DEFINE_TYPE_WITH_CODE (TpTestsRoomListChan, tp_tests_room_list_chan, TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST, room_list_iface_init))
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST1, room_list_iface_init))
> 
> enum {
>   PROP_SERVER = 1,
>@@ -106,7 +106,7 @@ fill_immutable_properties (TpBaseChannel *chan,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_ROOM_LIST, "Server",
>+      TP_IFACE_CHANNEL_TYPE_ROOM_LIST1, "Server",
>       NULL);
> }
> 
>@@ -133,7 +133,7 @@ tp_tests_room_list_chan_class_init (
>   oclass->constructed = tp_tests_room_list_chan_constructed;
>   oclass->finalize = tp_tests_room_list_chan_finalize;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST1;
>   base_class->target_handle_type = TP_HANDLE_TYPE_NONE;
>   base_class->fill_immutable_properties = fill_immutable_properties;
>   base_class->close = room_list_chan_close;
>@@ -145,7 +145,7 @@ tp_tests_room_list_chan_class_init (
>   g_object_class_install_property (oclass, PROP_SERVER, spec);
> 
>   tp_dbus_properties_mixin_implement_interface (oclass,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       room_list_props);
> 
>@@ -196,19 +196,19 @@ find_rooms (gpointer data)
>   /* Find 2 rooms */
>   add_room (rooms);
>   add_room (rooms);
>-  tp_svc_channel_type_room_list_emit_got_rooms (self, rooms);
>+  tp_svc_channel_type_room_list1_emit_got_rooms (self, rooms);
>   g_ptr_array_set_size (rooms, 0);
> 
>   /* Find 1 room */
>   add_room (rooms);
>-  tp_svc_channel_type_room_list_emit_got_rooms (self, rooms);
>+  tp_svc_channel_type_room_list1_emit_got_rooms (self, rooms);
>   g_ptr_array_unref (rooms);
> 
>   return FALSE;
> }
> 
> static void
>-room_list_list_rooms (TpSvcChannelTypeRoomList *chan,
>+room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan,
>     DBusGMethodInvocation *context)
> {
>   TpTestsRoomListChan *self = TP_TESTS_ROOM_LIST_CHAN (chan);
>@@ -232,21 +232,21 @@ room_list_list_rooms (TpSvcChannelTypeRoomList *chan,
>     }
> 
>   self->priv->listing = TRUE;
>-  tp_svc_channel_type_room_list_emit_listing_rooms (self, TRUE);
>+  tp_svc_channel_type_room_list1_emit_listing_rooms (self, TRUE);
> 
>   g_idle_add (find_rooms, self);
> 
>-  tp_svc_channel_type_room_list_return_from_list_rooms (context);
>+  tp_svc_channel_type_room_list1_return_from_list_rooms (context);
> }
> 
> static void
> room_list_iface_init (gpointer iface,
>     gpointer data)
> {
>-  TpSvcChannelTypeRoomListClass *klass = iface;
>+  TpSvcChannelTypeRoomList1Class *klass = iface;
> 
> #define IMPLEMENT(x) \
>-  tp_svc_channel_type_room_list_implement_##x (klass, room_list_##x)
>+  tp_svc_channel_type_room_list1_implement_##x (klass, room_list_##x)
>   IMPLEMENT(list_rooms);
> #undef IMPLEMENT
> }
>diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c
>index 7b9261d..2c6131b 100644
>--- a/tests/lib/simple-account.c
>+++ b/tests/lib/simple-account.c
>@@ -22,11 +22,11 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccount,
>     G_TYPE_OBJECT,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT,
>         account_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR1,
>         NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING1,
>         NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE1,
>         NULL);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>         tp_dbus_properties_mixin_iface_init)
>@@ -34,8 +34,8 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccount,
> 
> /* TP_IFACE_ACCOUNT is implied */
> static const char *ACCOUNT_INTERFACES[] = {
>-    TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING,
>-    TP_IFACE_ACCOUNT_INTERFACE_STORAGE,
>+    TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1,
>+    TP_IFACE_ACCOUNT_INTERFACE_STORAGE1,
>     NULL };
> 
> enum
>@@ -372,18 +372,18 @@ tp_tests_simple_account_class_init (TpTestsSimpleAccountClass *klass)
>           a_props
>         },
>         {
>-          TP_IFACE_ACCOUNT_INTERFACE_STORAGE,
>+          TP_IFACE_ACCOUNT_INTERFACE_STORAGE1,
>           tp_dbus_properties_mixin_getter_gobject_properties,
>           NULL,
>           ais_props
>         },
>         {
>-          TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING,
>+          TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1,
>           tp_dbus_properties_mixin_getter_gobject_properties,
>           NULL,
>           aia_props
>         },
>-        { TP_IFACE_ACCOUNT_INTERFACE_AVATAR,
>+        { TP_IFACE_ACCOUNT_INTERFACE_AVATAR1,
>           tp_dbus_properties_mixin_getter_gobject_properties,
>           NULL,
>           avatar_props
>@@ -634,7 +634,7 @@ tp_tests_simple_account_add_uri_scheme (TpTestsSimpleAccount *self,
>       NULL);
> 
>   tp_svc_dbus_properties_emit_properties_changed (self,
>-      TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING, changed, NULL);
>+      TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1, changed, NULL);
> 
>   g_strfreev (schemes);
>   g_hash_table_unref (changed);
>diff --git a/tests/lib/simple-channel-request.c b/tests/lib/simple-channel-request.c
>index 4884cb0..895e302 100644
>--- a/tests/lib/simple-channel-request.c
>+++ b/tests/lib/simple-channel-request.c
>@@ -107,11 +107,11 @@ add_channel (TpTestsSimpleChannelRequest *self,
>       chan_path = tp_tests_simple_connection_ensure_text_chan (self->priv->conn,
>           target_id, &props);
>     }
>-  else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_ROOM_LIST))
>+  else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_ROOM_LIST1))
>     {
>       chan_path = tp_tests_simple_connection_ensure_room_list_chan (
>           self->priv->conn, tp_asv_get_string (request,
>-            TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER), &props);
>+            TP_PROP_CHANNEL_TYPE_ROOM_LIST1_SERVER), &props);
>     }
>   else
>     {
>diff --git a/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
>index e1184af..a85f3b5 100644
>--- a/tests/lib/stream-tube-chan.c
>+++ b/tests/lib/stream-tube-chan.c
>@@ -140,9 +140,9 @@ static void stream_tube_iface_init (gpointer iface, gpointer data);
> G_DEFINE_ABSTRACT_TYPE_WITH_CODE (TpTestsStreamTubeChannel,
>     tp_tests_stream_tube_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE1,
>       stream_tube_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE1,
>       NULL);
>     )
> 
>@@ -156,7 +156,7 @@ tp_tests_stream_tube_channel_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       tp_tests_stream_tube_channel_parent_class)->get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE1);
>   return interfaces;
> };
> 
>@@ -236,8 +236,8 @@ fill_immutable_properties (TpBaseChannel *chan,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, "Service",
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, "SupportedSocketTypes",
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1, "Service",
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1, "SupportedSocketTypes",
>       NULL);
> 
>   if (!tp_base_channel_is_requested (chan))
>@@ -245,7 +245,7 @@ fill_immutable_properties (TpBaseChannel *chan,
>       /* Parameters is immutable only for incoming tubes */
>       tp_dbus_properties_mixin_fill_properties_hash (
>           G_OBJECT (chan), properties,
>-          TP_IFACE_CHANNEL_INTERFACE_TUBE, "Parameters",
>+          TP_IFACE_CHANNEL_INTERFACE_TUBE1, "Parameters",
>           NULL);
>     }
> }
>@@ -272,7 +272,7 @@ tp_tests_stream_tube_channel_class_init (TpTestsStreamTubeChannelClass *klass)
>   object_class->set_property = tp_tests_stream_tube_channel_set_property;
>   object_class->dispose = dispose;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_STREAM_TUBE;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1;
>   base_class->get_interfaces = tp_tests_stream_tube_channel_get_interfaces;
>   base_class->close = channel_close;
>   base_class->fill_immutable_properties = fill_immutable_properties;
>@@ -317,12 +317,12 @@ tp_tests_stream_tube_channel_class_init (TpTestsStreamTubeChannelClass *klass)
>       1, G_TYPE_IO_STREAM);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       stream_tube_props);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE,
>+      TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       tube_props);
> 
>@@ -336,7 +336,7 @@ change_state (TpTestsStreamTubeChannel *self,
> {
>   self->priv->state = state;
> 
>-  tp_svc_channel_interface_tube_emit_tube_channel_state_changed (self, state);
>+  tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (self, state);
> }
> 
> /* Return the address of the socket which has been shared over the tube */
>@@ -370,7 +370,7 @@ check_address_type (TpTestsStreamTubeChannel *self,
> }
> 
> static void
>-stream_tube_offer (TpSvcChannelTypeStreamTube *iface,
>+stream_tube_offer (TpSvcChannelTypeStreamTube1 *iface,
>     guint address_type,
>     const GValue *address,
>     guint access_control,
>@@ -400,7 +400,7 @@ stream_tube_offer (TpSvcChannelTypeStreamTube *iface,
> 
>   change_state (self, TP_TUBE_CHANNEL_STATE_REMOTE_PENDING);
> 
>-  tp_svc_channel_type_stream_tube_return_from_offer (context);
>+  tp_svc_channel_type_stream_tube1_return_from_offer (context);
>   return;
> 
> fail:
>@@ -452,7 +452,7 @@ service_incoming_cb (GSocketService *service,
>       g_object_unref (addr);
>     }
> 
>-  tp_svc_channel_type_stream_tube_emit_new_local_connection (self,
>+  tp_svc_channel_type_stream_tube1_emit_new_local_connection (self,
>       self->priv->connection_id);
> 
>   self->priv->connection_id++;
>@@ -461,7 +461,7 @@ service_incoming_cb (GSocketService *service,
> }
> 
> static void
>-stream_tube_accept (TpSvcChannelTypeStreamTube *iface,
>+stream_tube_accept (TpSvcChannelTypeStreamTube1 *iface,
>     TpSocketAddressType address_type,
>     TpSocketAccessControl access_control,
>     const GValue *access_control_param,
>@@ -497,7 +497,7 @@ stream_tube_accept (TpSvcChannelTypeStreamTube *iface,
> 
>   change_state (self, TP_TUBE_CHANNEL_STATE_OPEN);
> 
>-  tp_svc_channel_type_stream_tube_return_from_accept (context, address);
>+  tp_svc_channel_type_stream_tube1_return_from_accept (context, address);
> 
>   tp_g_value_slice_free (address);
>   return;
>@@ -511,9 +511,9 @@ static void
> stream_tube_iface_init (gpointer iface,
>     gpointer data)
> {
>-  TpSvcChannelTypeStreamTubeClass *klass = iface;
>+  TpSvcChannelTypeStreamTube1Class *klass = iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_type_stream_tube_implement_##x (klass, stream_tube_##x)
>+#define IMPLEMENT(x) tp_svc_channel_type_stream_tube1_implement_##x (klass, stream_tube_##x)
>   IMPLEMENT(offer);
>   IMPLEMENT(accept);
> #undef IMPLEMENT
>@@ -589,7 +589,7 @@ tp_tests_stream_tube_channel_peer_connected (TpTestsStreamTubeChannel *self,
>         g_assert_not_reached ();
>     }
> 
>-  tp_svc_channel_type_stream_tube_emit_new_remote_connection (self, handle,
>+  tp_svc_channel_type_stream_tube1_emit_new_remote_connection (self, handle,
>       tp_handle_inspect (contact_repo, handle), connection_param,
>       self->priv->connection_id);
> 
>@@ -603,7 +603,7 @@ tp_tests_stream_tube_channel_last_connection_disconnected (
>     TpTestsStreamTubeChannel *self,
>     const gchar *error)
> {
>-  tp_svc_channel_type_stream_tube_emit_connection_closed (self,
>+  tp_svc_channel_type_stream_tube1_emit_connection_closed (self,
>       self->priv->connection_id - 1, error, "kaboum");
> }
> 
>diff --git a/tests/lib/textchan-group.c b/tests/lib/textchan-group.c
>index 3b9b179..b305876 100644
>--- a/tests/lib/textchan-group.c
>+++ b/tests/lib/textchan-group.c
>@@ -22,9 +22,9 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsTextChannelGroup,
>     tp_tests_text_channel_group, TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
>         tp_message_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>       tp_group_mixin_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD1,
>       password_iface_init);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>       tp_dbus_properties_mixin_iface_init))
>@@ -37,8 +37,8 @@ text_channel_group_get_interfaces (TpBaseChannel *self)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       tp_tests_text_channel_group_parent_class)->get_interfaces (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_PASSWORD);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_PASSWORD1);
>   return interfaces;
> };
> 
>@@ -285,15 +285,15 @@ tp_tests_text_channel_set_password (TpTestsTextChannelGroup *self,
>     return;
> 
>   if (pass_needed)
>-    tp_svc_channel_interface_password_emit_password_flags_changed (self,
>+    tp_svc_channel_interface_password1_emit_password_flags_changed (self,
>         TP_CHANNEL_PASSWORD_FLAG_PROVIDE, 0);
>   else
>-    tp_svc_channel_interface_password_emit_password_flags_changed (self,
>+    tp_svc_channel_interface_password1_emit_password_flags_changed (self,
>         0, TP_CHANNEL_PASSWORD_FLAG_PROVIDE);
> }
> 
> static void
>-password_get_password_flags (TpSvcChannelInterfacePassword *chan,
>+password_get_password_flags (TpSvcChannelInterfacePassword1 *chan,
>     DBusGMethodInvocation *context)
> {
>   TpTestsTextChannelGroup *self = (TpTestsTextChannelGroup *) chan;
>@@ -302,27 +302,27 @@ password_get_password_flags (TpSvcChannelInterfacePassword *chan,
>   if (self->priv->password != NULL)
>     flags |= TP_CHANNEL_PASSWORD_FLAG_PROVIDE;
> 
>-  tp_svc_channel_interface_password_return_from_get_password_flags (context,
>+  tp_svc_channel_interface_password1_return_from_get_password_flags (context,
>       flags);
> }
> 
> static void
>-password_provide_password (TpSvcChannelInterfacePassword *chan,
>+password_provide_password (TpSvcChannelInterfacePassword1 *chan,
>     const gchar *password,
>     DBusGMethodInvocation *context)
> {
>   TpTestsTextChannelGroup *self = (TpTestsTextChannelGroup *) chan;
> 
>-  tp_svc_channel_interface_password_return_from_provide_password (context,
>+  tp_svc_channel_interface_password1_return_from_provide_password (context,
>       !tp_strdiff (password, self->priv->password));
> }
> 
> static void
> password_iface_init (gpointer iface, gpointer data)
> {
>-  TpSvcChannelInterfacePasswordClass *klass = iface;
>+  TpSvcChannelInterfacePassword1Class *klass = iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_password_implement_##x (klass, password_##x)
>+#define IMPLEMENT(x) tp_svc_channel_interface_password1_implement_##x (klass, password_##x)
>   IMPLEMENT (get_password_flags);
>   IMPLEMENT (provide_password);
> #undef IMPLEMENT
>diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
>index 7b3c67d..a8a96cb 100644
>--- a/tools/glib-client-gen.py
>+++ b/tools/glib-client-gen.py
>@@ -1212,9 +1212,6 @@ class Generator(object):
>         assert len(ifaces) == 1
>         iface = ifaces[0]
>         name = node.getAttribute('name').replace('/', '')
>-        # This is a hack to get rid of interface version numbers
>-        # until we migrate to generating version-numbered code
>-        name = name.replace('Call1_', 'Call_').rstrip('1')
> 
>         self.iface = name
>         self.iface_lc = name.lower()
>@@ -1315,9 +1312,6 @@ class Generator(object):
>                 if not signals:
>                     continue
>                 name = node.getAttribute('name').replace('/', '').lower()
>-                # This is a hack to get rid of interface version numbers
>-                # until we migrate to generating version-numbered code
>-                name = name.replace('call1_', 'call_').rstrip('1')
>                 self.iface_uc = name.upper()
>                 self.b('  if (quark == %s)' % self.get_iface_quark())
>                 self.b('    %s_add_signals_for_%s (proxy);'
>diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py
>index edca4a3..6ef9f4a 100644
>--- a/tools/glib-ginterface-gen.py
>+++ b/tools/glib-ginterface-gen.py
>@@ -96,9 +96,6 @@ class Generator(object):
> 
>     def do_node(self, node):
>         node_name = node.getAttribute('name').replace('/', '')
>-        # This is a hack to get rid of interface version numbers
>-        # until we migrate to generating version-numbered code
>-        node_name = node_name.replace('Call1_', 'Call_').rstrip('1')
>         node_name_mixed = self.node_name_mixed = node_name.replace('_', '')
>         node_name_lc = self.node_name_lc = node_name.lower()
>         node_name_uc = self.node_name_uc = node_name.upper()
>diff --git a/tools/glib-interfaces-gen.py b/tools/glib-interfaces-gen.py
>index 47f4c08..b67d7b4 100644
>--- a/tools/glib-interfaces-gen.py
>+++ b/tools/glib-interfaces-gen.py
>@@ -75,14 +75,14 @@ class Generator(object):
>  * The interface name "%(name)s"
>  */
> """ % {'IFACE_DEFINE' : (self.prefix + 'IFACE_' + \
>-            parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+            parent_name).upper().replace('/', ''),
>        'name' : iface.getAttribute('name')})
> 
>         self.h("""
> #define %(IFACE_DEFINE)s \\
> "%(name)s"
> """ % {'IFACE_DEFINE' : (self.prefix + 'IFACE_' + \
>-            parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+            parent_name).upper().replace('/', ''),
>        'name' : iface.getAttribute('name')})
> 
>         self.d("""
>@@ -93,9 +93,9 @@ class Generator(object):
> name "%(name)s"
>  */
> """ % {'IFACE_QUARK_DEFINE' : (self.prefix + 'IFACE_QUARK_' + \
>-            parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+            parent_name).upper().replace('/', ''),
>        'iface_quark_func' : (self.prefix + 'iface_quark_' + \
>-            parent_name).lower().replace('/', '').replace('call1_', 'call_').rstrip('1'),
>+            parent_name).lower().replace('/', ''),
>        'name' : iface.getAttribute('name')})
> 
>         self.h("""
>@@ -105,9 +105,9 @@ name "%(name)s"
> GQuark %(iface_quark_func)s (void);
> 
> """ % {'IFACE_QUARK_DEFINE' : (self.prefix + 'IFACE_QUARK_' + \
>-            parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+            parent_name).upper().replace('/', ''),
>        'iface_quark_func' : (self.prefix + 'iface_quark_' + \
>-            parent_name).lower().replace('/', '').replace('call1_', 'call_').rstrip('1'),
>+            parent_name).lower().replace('/', ''),
>        'name' : iface.getAttribute('name')})
> 
>         self.c("""\
>@@ -125,7 +125,7 @@ GQuark
> }
> 
> """ % {'iface_quark_func' : (self.prefix + 'iface_quark_' + \
>-            parent_name).lower().replace('/', '').replace('call1_', 'call_').rstrip('1'),
>+            parent_name).lower().replace('/', ''),
>        'name' : iface.getAttribute('name')})
> 
>         for prop in iface.getElementsByTagNameNS(None, 'property'):
>@@ -136,7 +136,7 @@ GQuark
>  * The fully-qualified property name "%(name)s.%(prop)s"
>  */
> """ % {'IFACE_PREFIX' : (self.prefix + 'PROP_' + \
>-                parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+                parent_name).upper().replace('/', ''),
>            'PROP_UC': prop.getAttributeNS(NS_TP, "name-for-bindings").upper(),
>            'name' : iface.getAttribute('name'),
>            'prop' : prop.getAttribute('name'),
>@@ -146,7 +146,7 @@ GQuark
> #define %(IFACE_PREFIX)s_%(PROP_UC)s \\
> "%(name)s.%(prop)s"
> """ % {'IFACE_PREFIX' : (self.prefix + 'PROP_' + \
>-                parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+                parent_name).upper().replace('/', ''),
>            'PROP_UC': prop.getAttributeNS(NS_TP, "name-for-bindings").upper(),
>            'name' : iface.getAttribute('name'),
>            'prop' : prop.getAttribute('name'),
>@@ -161,7 +161,7 @@ GQuark
>  * The fully-qualified contact attribute token name "%(name)s/%(prop)s"
>  */
> """ % {'TOKEN_PREFIX' : (self.prefix + 'TOKEN_' + \
>-                parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+                parent_name).upper().replace('/', ''),
>            'TOKEN_UC': prop.getAttributeNS(None, "name").upper().replace("-", "_").replace(".", "_"),
>            'name' : iface.getAttribute('name'),
>            'prop' : prop.getAttribute('name'),
>@@ -171,7 +171,7 @@ GQuark
> #define %(TOKEN_PREFIX)s_%(TOKEN_UC)s \\
> "%(name)s/%(prop)s"
> """ % {'TOKEN_PREFIX' : (self.prefix + 'TOKEN_' + \
>-                parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+                parent_name).upper().replace('/', ''),
>            'TOKEN_UC': prop.getAttributeNS(None, "name").upper().replace("-", "_").replace(".", "_"),
>            'name' : iface.getAttribute('name'),
>            'prop' : prop.getAttribute('name'),
>@@ -186,7 +186,7 @@ GQuark
>  * The fully-qualified capability token name "%(name)s/%(prop)s"
>  */
> """ % {'TOKEN_PREFIX' : (self.prefix + 'TOKEN_' + \
>-                parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+                parent_name).upper().replace('/', ''),
>            'TOKEN_UC': prop.getAttributeNS(None, "name").upper().replace("-", "_").replace(".", "_"),
>            'name' : iface.getAttribute('name'),
>            'prop' : prop.getAttribute('name'),
>@@ -196,7 +196,7 @@ GQuark
> #define %(TOKEN_PREFIX)s_%(TOKEN_UC)s \\
> "%(name)s/%(prop)s"
> """ % {'TOKEN_PREFIX' : (self.prefix + 'TOKEN_' + \
>-                parent_name).upper().replace('/', '').replace('CALL1_', 'CALL_').rstrip('1'),
>+                parent_name).upper().replace('/', ''),
>            'TOKEN_UC': prop.getAttributeNS(None, "name").upper().replace("-", "_").replace(".", "_"),
>            'name' : iface.getAttribute('name'),
>            'prop' : prop.getAttribute('name'),
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 70377: 87462 | 87463 | 87464 | 87743 | 87744 | 88113 | 88114 | 88215 | 88216 | 88221 | 88236

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.