Attachment 88113 Details for Bug 70377 – [gabble] Adapt for use of ABI versions in generated code

[patch] [gabble] Adapt for use of ABI versions in generated code

0001-Adapt-for-use-of-ABI-versions-in-generated-code.patch (text/plain), 141.83 KB, created by Guillaume Desmottes on 2013-10-25 15:10:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-10-25 15:10:30 UTC

Size: 141.83 KB

patch

obsolete

>From ab25c49a9cd2dc76b919949d4b85a37153e6cd6f Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Fri, 25 Oct 2013 17:09:30 +0200
>Subject: [PATCH] Adapt for use of ABI versions in generated code
>
>---
> src/call-content.c          |   4 +-
> src/call-muc-channel.c      |  14 +++---
> src/conn-addressing.c       |  18 ++++----
> src/conn-aliasing.c         |  18 ++++----
> src/conn-avatars.c          |  36 +++++++--------
> src/conn-client-types.c     |  14 +++---
> src/conn-contact-info.c     |  26 +++++------
> src/conn-location.c         |  18 ++++----
> src/conn-mail-notif.c       |  18 ++++----
> src/conn-power-saving.c     |  12 ++---
> src/connection.c            |  82 +++++++++++++++++-----------------
> src/ft-channel.c            | 106 ++++++++++++++++++++++----------------------
> src/ft-manager.c            |  58 ++++++++++++------------
> src/im-channel.c            |  16 +++----
> src/media-factory.c         |  60 ++++++++++++-------------
> src/muc-channel.c           |  80 ++++++++++++++++-----------------
> src/muc-factory.c           |  56 +++++++++++------------
> src/muc-tube-dbus.c         |   2 +-
> src/muc-tube-stream.c       |   2 +-
> src/private-tubes-factory.c |  52 +++++++++++-----------
> src/protocol.c              |  14 +++---
> src/roomlist-channel.c      |  40 ++++++++---------
> src/roomlist-manager.c      |   8 ++--
> src/search-channel.c        |  28 ++++++------
> src/search-manager.c        |   8 ++--
> src/server-sasl-channel.c   |  62 +++++++++++++-------------
> src/server-tls-channel.c    |  12 ++---
> src/tube-dbus.c             |  44 +++++++++---------
> src/tube-stream.c           |  50 ++++++++++-----------
> src/write-mgr-file.c        |  22 ++++-----
> 30 files changed, 490 insertions(+), 490 deletions(-)
>
>diff --git a/src/call-content.c b/src/call-content.c
>index 827dc24..da9494d 100644
>--- a/src/call-content.c
>+++ b/src/call-content.c
>@@ -237,7 +237,7 @@ call_content_local_media_description_updated (GabbleCallContent *self,
>   WockyJingleMediaDescription *md = wocky_jingle_media_description_new ();
> 
>   md->codecs = codec_array_to_list (tp_asv_get_boxed (properties,
>-          TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+          TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>           TP_ARRAY_TYPE_CODEC_LIST));
> 
>   for (l = self->priv->contents; l != NULL; l = g_list_next (l))
>@@ -313,7 +313,7 @@ call_content_setup_jingle (GabbleCallContent *self,
>   if (tp_md != NULL)
>     {
>       md->codecs = codec_array_to_list (tp_asv_get_boxed (tp_md,
>-          TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+          TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>           TP_ARRAY_TYPE_CODEC_LIST));
>     }
> 
>diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c
>index 1dbf3b2..61a430f 100644
>--- a/src/call-muc-channel.c
>+++ b/src/call-muc-channel.c
>@@ -58,7 +58,7 @@ static void call_muc_channel_close (TpBaseChannel *base);
> G_DEFINE_TYPE_WITH_CODE (GabbleCallMucChannel,
>   gabble_call_muc_channel, GABBLE_TYPE_BASE_CALL_CHANNEL,
>   G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init);
>-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>     tp_external_group_mixin_iface_init));
> 
> typedef enum
>@@ -292,7 +292,7 @@ call_muc_channel_got_codecs (GabbleCallMucChannel *self)
>       tp_md = tp_base_media_call_content_get_local_media_description (content,
>           0);
>       codecs = tp_asv_get_boxed (tp_md,
>-          TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+          TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>           TP_ARRAY_TYPE_CODEC_LIST);
> 
>       if (codecs == NULL)
>@@ -555,7 +555,7 @@ call_muc_channel_send_new_state (GabbleCallMucChannel *self)
>       tp_md = tp_base_media_call_content_get_local_media_description (
>           TP_BASE_MEDIA_CALL_CONTENT (content), 0);
>       codecs = tp_asv_get_boxed (tp_md,
>-          TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS,
>+          TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS,
>           TP_ARRAY_TYPE_CODEC_LIST);
>       for (i = 0; i < codecs->len; i++)
>         {
>@@ -1064,14 +1064,14 @@ gabble_call_muc_channel_new_async (GabbleConnection *connection,
>   if (request != NULL)
>     {
>       initial_audio = tp_asv_get_boolean (request,
>-          TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL);
>+          TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL);
>       initial_video = tp_asv_get_boolean (request,
>-          TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL);
>+          TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL);
> 
>       initial_audio_name = tp_asv_get_string (request,
>-          TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME);
>+          TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME);
>       initial_video_name = tp_asv_get_string (request,
>-          TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME);
>+          TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME);
>     }
> 
>   g_async_initable_new_async (GABBLE_TYPE_CALL_MUC_CHANNEL,
>diff --git a/src/conn-addressing.c b/src/conn-addressing.c
>index 8a51845..5e3231f 100644
>--- a/src/conn-addressing.c
>+++ b/src/conn-addressing.c
>@@ -34,7 +34,7 @@
> 
> static const char *assumed_interfaces[] = {
>     TP_IFACE_CONNECTION,
>-    TP_IFACE_CONNECTION_INTERFACE_ADDRESSING,
>+    TP_IFACE_CONNECTION_INTERFACE_ADDRESSING1,
>     NULL
>   };
> 
>@@ -48,11 +48,11 @@ _fill_contact_attributes (TpHandleRepoIface *contact_repo,
>   GHashTable *addresses = gabble_vcard_addresses_for_handle (contact_repo, contact);
> 
>   tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-      contact, TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_URIS,
>+      contact, TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING1_URIS,
>       tp_g_value_slice_new_take_boxed (G_TYPE_STRV, uris));
> 
>   tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-      contact, TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_ADDRESSES,
>+      contact, TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING1_ADDRESSES,
>       tp_g_value_slice_new_take_boxed (TP_HASH_TYPE_STRING_STRING_MAP, addresses));
> }
> 
>@@ -73,7 +73,7 @@ conn_addressing_fill_contact_attributes (GObject *obj,
> }
> 
> static void
>-conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing *iface,
>+conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing1 *iface,
>     const gchar **uris,
>     const gchar **interfaces,
>     DBusGMethodInvocation *context)
>@@ -100,7 +100,7 @@ conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing *iface,
>   attributes = tp_contacts_mixin_get_contact_attributes (G_OBJECT (iface), handles,
>       interfaces, assumed_interfaces);
> 
>-  tp_svc_connection_interface_addressing_return_from_get_contacts_by_uri (
>+  tp_svc_connection_interface_addressing1_return_from_get_contacts_by_uri (
>       context, requested, attributes);
> 
>   g_array_unref (handles);
>@@ -109,7 +109,7 @@ conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing *iface,
> }
> 
> static void
>-conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing *iface,
>+conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing1 *iface,
>     const gchar *field,
>     const gchar **addresses,
>     const gchar **interfaces,
>@@ -138,7 +138,7 @@ conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing
>   attributes = tp_contacts_mixin_get_contact_attributes (G_OBJECT (iface), handles,
>       interfaces, assumed_interfaces);
> 
>-  tp_svc_connection_interface_addressing_return_from_get_contacts_by_vcard_field (
>+  tp_svc_connection_interface_addressing1_return_from_get_contacts_by_vcard_field (
>       context, requested, attributes);
> 
>   g_array_unref (handles);
>@@ -149,7 +149,7 @@ conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing
> void
> conn_addressing_init (GabbleConnection *self) {
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (self),
>-      TP_IFACE_CONNECTION_INTERFACE_ADDRESSING,
>+      TP_IFACE_CONNECTION_INTERFACE_ADDRESSING1,
>       conn_addressing_fill_contact_attributes);
> }
> 
>@@ -158,7 +158,7 @@ conn_addressing_iface_init (gpointer g_iface,
>     gpointer iface_data)
> {
> #define IMPLEMENT(x) \
>-  tp_svc_connection_interface_addressing_implement_##x (\
>+  tp_svc_connection_interface_addressing1_implement_##x (\
>   g_iface, conn_addressing_##x)
> 
>   IMPLEMENT (get_contacts_by_uri);
>diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
>index c3e0e47..8dabfd3 100644
>--- a/src/conn-aliasing.c
>+++ b/src/conn-aliasing.c
>@@ -117,7 +117,7 @@ aliases_request_try_return (AliasesRequest *request)
>       /* Cast to (const gchar **) necessary because no-one understands 'const'
>        * in C.
>        */
>-      tp_svc_connection_interface_aliasing_return_from_request_aliases (
>+      tp_svc_connection_interface_aliasing1_return_from_request_aliases (
>           request->request_call, (const gchar **)request->aliases);
>       return TRUE;
>     }
>@@ -356,7 +356,7 @@ gabble_do_pep_request (GabbleConnection *self,
>  *           or throw an error.
>  */
> static void
>-gabble_connection_request_aliases (TpSvcConnectionInterfaceAliasing *iface,
>+gabble_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
>                                    const GArray *contacts,
>                                    DBusGMethodInvocation *context)
> {
>@@ -564,7 +564,7 @@ set_one_alias (
>  * on interface Connection.Interface.Aliasing
>  */
> static void
>-gabble_connection_set_aliases (TpSvcConnectionInterfaceAliasing *iface,
>+gabble_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
>                                GHashTable *aliases,
>                                DBusGMethodInvocation *context)
> {
>@@ -589,7 +589,7 @@ gabble_connection_set_aliases (TpSvcConnectionInterfaceAliasing *iface,
> 
>   if (retval)
>     {
>-      tp_svc_connection_interface_aliasing_return_from_set_aliases (
>+      tp_svc_connection_interface_aliasing1_return_from_set_aliases (
>           context);
>     }
>   else
>@@ -816,7 +816,7 @@ gabble_conn_aliasing_nicknames_updated (GObject *object,
>     }
> 
>   if (g_hash_table_size (aliases) > 0)
>-    tp_svc_connection_interface_aliasing_emit_aliases_changed (conn, aliases);
>+    tp_svc_connection_interface_aliasing1_emit_aliases_changed (conn, aliases);
> 
>   g_hash_table_unref (aliases);
> }
>@@ -1053,7 +1053,7 @@ conn_aliasing_fill_contact_attributes (GObject *obj,
>       g_value_take_string (val, alias);
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-        handle, TP_IFACE_CONNECTION_INTERFACE_ALIASING"/alias",
>+        handle, TP_IFACE_CONNECTION_INTERFACE_ALIASING1"/alias",
>         val);
> 
>       maybe_request_vcard (self, handle, source);
>@@ -1064,7 +1064,7 @@ void
> conn_aliasing_init (GabbleConnection *conn)
> {
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (conn),
>-    TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+    TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>     conn_aliasing_fill_contact_attributes);
> 
>   conn->pep_nick = wocky_pep_service_new (NS_NICK, TRUE);
>@@ -1083,9 +1083,9 @@ conn_aliasing_finalize (GabbleConnection *conn)
> void
> conn_aliasing_iface_init (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, gabble_connection_##x)
>   IMPLEMENT(request_aliases);
>   IMPLEMENT(set_aliases);
>diff --git a/src/conn-avatars.c b/src/conn-avatars.c
>index 00ff3a8..0ffad17 100644
>--- a/src/conn-avatars.c
>+++ b/src/conn-avatars.c
>@@ -54,7 +54,7 @@ update_own_avatar_sha1 (GabbleConnection *conn,
>   if (!tp_strdiff (sha1, conn->self_presence->avatar_sha1))
>     return TRUE;
> 
>-  tp_svc_connection_interface_avatars_emit_avatar_updated (conn,
>+  tp_svc_connection_interface_avatars1_emit_avatar_updated (conn,
>       tp_base_connection_get_self_handle (base), sha1);
> 
>   g_free (conn->self_presence->avatar_sha1);
>@@ -89,7 +89,7 @@ connection_avatar_update_cb (GabblePresenceCache *cache,
>   if (handle == tp_base_connection_get_self_handle (base))
>     update_own_avatar_sha1 (conn, sha1, NULL);
>   else
>-    tp_svc_connection_interface_avatars_emit_avatar_updated (conn,
>+    tp_svc_connection_interface_avatars1_emit_avatar_updated (conn,
>         handle, sha1);
> }
> 
>@@ -144,7 +144,7 @@ _got_self_avatar_for_get_known_avatar_tokens (GObject *obj,
>       GUINT_TO_POINTER (tp_base_connection_get_self_handle (base)),
>       g_strdup (sha1));
> 
>-  tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (
>+  tp_svc_connection_interface_avatars1_return_from_get_known_avatar_tokens (
>       context->invocation, context->ret);
>   g_hash_table_unref (context->ret);
> 
>@@ -162,7 +162,7 @@ _got_self_avatar_for_get_known_avatar_tokens (GObject *obj,
>  *           or throw an error.
>  */
> static void
>-gabble_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars *iface,
>+gabble_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars1 *iface,
>                                            const GArray *contacts,
>                                            DBusGMethodInvocation *invocation)
> {
>@@ -243,7 +243,7 @@ gabble_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars *ifac
>       return;
>     }
> 
>-  tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (
>+  tp_svc_connection_interface_avatars1_return_from_get_known_avatar_tokens (
>       invocation, ret);
> 
>   g_hash_table_unref (ret);
>@@ -317,7 +317,7 @@ parse_avatar (WockyNode *vcard,
> }
> 
> static void
>-emit_avatar_retrieved (TpSvcConnectionInterfaceAvatars *iface,
>+emit_avatar_retrieved (TpSvcConnectionInterfaceAvatars1 *iface,
>                        TpHandle contact,
>                        WockyNode *vcard_node)
> {
>@@ -332,7 +332,7 @@ emit_avatar_retrieved (TpSvcConnectionInterfaceAvatars *iface,
>   sha1 = sha1_hex (avatar_str->str, avatar_str->len);
>   arr = g_array_new (FALSE, FALSE, sizeof (gchar));
>   g_array_append_vals (arr, avatar_str->str, avatar_str->len);
>-  tp_svc_connection_interface_avatars_emit_avatar_retrieved (iface, contact,
>+  tp_svc_connection_interface_avatars1_emit_avatar_retrieved (iface, contact,
>       sha1, arr, mime_type);
>   g_array_unref (arr);
>   g_free (sha1);
>@@ -343,7 +343,7 @@ emit_avatar_retrieved (TpSvcConnectionInterfaceAvatars *iface,
> typedef struct {
>     TpHandle handle;
>     GabbleConnection *conn;
>-    TpSvcConnectionInterfaceAvatars *iface;
>+    TpSvcConnectionInterfaceAvatars1 *iface;
> } RequestAvatarsContext;
> 
> static void
>@@ -369,7 +369,7 @@ request_avatars_cb (GabbleVCardManager *manager,
> }
> 
> static void
>-gabble_connection_request_avatars (TpSvcConnectionInterfaceAvatars *iface,
>+gabble_connection_request_avatars (TpSvcConnectionInterfaceAvatars1 *iface,
>                                    const GArray *contacts,
>                                    DBusGMethodInvocation *context)
> {
>@@ -419,7 +419,7 @@ gabble_connection_request_avatars (TpSvcConnectionInterfaceAvatars *iface,
>         }
>     }
> 
>-  tp_svc_connection_interface_avatars_return_from_request_avatars (context);
>+  tp_svc_connection_interface_avatars1_return_from_request_avatars (context);
> }
> 
> 
>@@ -483,9 +483,9 @@ _set_avatar_cb2 (GabbleVCardManager *manager,
> 
>       if (conn_presence_signal_own_presence (ctx->conn, NULL, &error))
>         {
>-          tp_svc_connection_interface_avatars_return_from_set_avatar (
>+          tp_svc_connection_interface_avatars1_return_from_set_avatar (
>               ctx->invocation, presence->avatar_sha1);
>-          tp_svc_connection_interface_avatars_emit_avatar_updated (
>+          tp_svc_connection_interface_avatars1_emit_avatar_updated (
>               ctx->conn, tp_base_connection_get_self_handle (base),
>               presence->avatar_sha1);
>         }
>@@ -510,7 +510,7 @@ _set_avatar_cb2 (GabbleVCardManager *manager,
>  *           or throw an error.
>  */
> static void
>-gabble_connection_set_avatar (TpSvcConnectionInterfaceAvatars *iface,
>+gabble_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *iface,
>                               const GArray *avatar,
>                               const gchar *mime_type,
>                               DBusGMethodInvocation *context)
>@@ -578,7 +578,7 @@ gabble_connection_set_avatar (TpSvcConnectionInterfaceAvatars *iface,
>  *           or throw an error.
>  */
> static void
>-gabble_connection_clear_avatar (TpSvcConnectionInterfaceAvatars *iface,
>+gabble_connection_clear_avatar (TpSvcConnectionInterfaceAvatars1 *iface,
>                                 DBusGMethodInvocation *context)
> {
>   gabble_connection_set_avatar (iface, NULL, NULL, context);
>@@ -612,7 +612,7 @@ conn_avatars_fill_contact_attributes (GObject *obj,
>             g_value_set_string (val, "");
> 
>           tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
>-            TP_IFACE_CONNECTION_INTERFACE_AVATARS"/token", val);
>+            TP_IFACE_CONNECTION_INTERFACE_AVATARS1"/token", val);
>         }
>     }
> }
>@@ -629,7 +629,7 @@ conn_avatars_init (GabbleConnection *conn)
>       (connection_avatar_update_cb), conn);
> 
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (conn),
>-      TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+      TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>           conn_avatars_fill_contact_attributes);
> }
> 
>@@ -637,9 +637,9 @@ conn_avatars_init (GabbleConnection *conn)
> void
> conn_avatars_iface_init (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, gabble_connection_##x)
>   IMPLEMENT(get_known_avatar_tokens);
>   IMPLEMENT(request_avatars);
>diff --git a/src/conn-client-types.c b/src/conn-client-types.c
>index 7285619..9fe8532 100644
>--- a/src/conn-client-types.c
>+++ b/src/conn-client-types.c
>@@ -79,7 +79,7 @@ get_client_types_from_handle (GabbleConnection *conn,
> }
> 
> static void
>-client_types_request_client_types (TpSvcConnectionInterfaceClientTypes *iface,
>+client_types_request_client_types (TpSvcConnectionInterfaceClientTypes1 *iface,
>     TpHandle contact,
>     DBusGMethodInvocation *context)
> {
>@@ -110,7 +110,7 @@ client_types_request_client_types (TpSvcConnectionInterfaceClientTypes *iface,
>       types = g_strdupv (empty);
>     }
> 
>-  tp_svc_connection_interface_client_types_return_from_request_client_types (
>+  tp_svc_connection_interface_client_types1_return_from_request_client_types (
>       context, (const gchar **) types);
> 
>   g_strfreev (types);
>@@ -120,9 +120,9 @@ void
> conn_client_types_iface_init (gpointer g_iface,
>     gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceClientTypesClass *klass = g_iface;
>+  TpSvcConnectionInterfaceClientTypes1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_client_types_implement_##x \
>+#define IMPLEMENT(x) tp_svc_connection_interface_client_types1_implement_##x \
>   (klass, client_types_##x)
>   IMPLEMENT (request_client_types);
> #undef IMPLEMENT
>@@ -148,7 +148,7 @@ conn_client_types_fill_contact_attributes (GObject *obj,
>       val = tp_g_value_slice_new_take_boxed (G_TYPE_STRV, types);
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
>-          TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES "/client-types", val);
>+          TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1 "/client-types", val);
>     }
> }
> 
>@@ -181,7 +181,7 @@ idle_timeout (gpointer user_data)
> 
>   if (get_client_types_from_handle (data->conn, data->handle, &types))
>     {
>-      tp_svc_connection_interface_client_types_emit_client_types_updated (
>+      tp_svc_connection_interface_client_types1_emit_client_types_updated (
>           data->conn, data->handle, (const gchar **) types);
>       g_strfreev (types);
>     }
>@@ -221,7 +221,7 @@ void
> conn_client_types_init (GabbleConnection *conn)
> {
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (conn),
>-    TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES,
>+    TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1,
>     conn_client_types_fill_contact_attributes);
> 
>   g_signal_connect (conn->presence_cache, "client-types-updated",
>diff --git a/src/conn-contact-info.c b/src/conn-contact-info.c
>index a2f7646..8812a48 100644
>--- a/src/conn-contact-info.c
>+++ b/src/conn-contact-info.c
>@@ -372,7 +372,7 @@ _parse_vcard (WockyNode *vcard_node,
> }
> 
> static void
>-_emit_contact_info_changed (TpSvcConnectionInterfaceContactInfo *iface,
>+_emit_contact_info_changed (TpSvcConnectionInterfaceContactInfo1 *iface,
>                             TpHandle contact,
>                             WockyNode *vcard_node)
> {
>@@ -383,7 +383,7 @@ _emit_contact_info_changed (TpSvcConnectionInterfaceContactInfo *iface,
>   if (contact_info == NULL)
>    return;
> 
>-  tp_svc_connection_interface_contact_info_emit_contact_info_changed (
>+  tp_svc_connection_interface_contact_info1_emit_contact_info_changed (
>       iface, contact, contact_info);
> 
>   g_boxed_free (TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
>@@ -451,7 +451,7 @@ _return_from_request_contact_info (WockyNode *vcard_node,
>       return;
>     }
> 
>-  tp_svc_connection_interface_contact_info_return_from_request_contact_info (
>+  tp_svc_connection_interface_contact_info1_return_from_request_contact_info (
>       context, contact_info);
> 
>   g_boxed_free (TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
>@@ -480,7 +480,7 @@ _request_vcard_cb (GabbleVCardManager *self,
>  *           or throw an error.
>  */
> static void
>-gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
>+gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *iface,
>                                         const GArray *contacts,
>                                         DBusGMethodInvocation *context)
> {
>@@ -521,7 +521,7 @@ gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *ifa
>         }
>     }
> 
>-  tp_svc_connection_interface_contact_info_return_from_refresh_contact_info (
>+  tp_svc_connection_interface_contact_info1_return_from_refresh_contact_info (
>       context);
> }
> 
>@@ -535,7 +535,7 @@ gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *ifa
>  *           or throw an error.
>  */
> static void
>-gabble_connection_request_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
>+gabble_connection_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *iface,
>                                         guint contact,
>                                         DBusGMethodInvocation *context)
> {
>@@ -650,7 +650,7 @@ _set_contact_info_cb (GabbleVCardManager *vcard_manager,
>     }
>   else
>     {
>-      tp_svc_connection_interface_contact_info_return_from_set_contact_info (
>+      tp_svc_connection_interface_contact_info1_return_from_set_contact_info (
>           context);
>     }
> }
>@@ -665,7 +665,7 @@ _set_contact_info_cb (GabbleVCardManager *vcard_manager,
>  *           or throw an error.
>  */
> static void
>-gabble_connection_set_contact_info (TpSvcConnectionInterfaceContactInfo *iface,
>+gabble_connection_set_contact_info (TpSvcConnectionInterfaceContactInfo1 *iface,
>                                     const GPtrArray *contact_info,
>                                     DBusGMethodInvocation *context)
> {
>@@ -878,7 +878,7 @@ _vcard_updated (GObject *object,
>         contact, &vcard_node))
>     {
>       _emit_contact_info_changed (
>-          TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO (conn),
>+          TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO1 (conn),
>           contact, vcard_node);
>     }
> }
>@@ -1057,7 +1057,7 @@ conn_contact_info_fill_contact_attributes (GObject *obj,
>                       TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
> 
>               tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-                      contact, TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO"/info",
>+                      contact, TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1"/info",
>                       val);
>             }
>         }
>@@ -1070,7 +1070,7 @@ conn_contact_info_init (GabbleConnection *conn)
>   g_assert (conn->vcard_manager != NULL);
> 
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (conn),
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>     conn_contact_info_fill_contact_attributes);
> 
>   conn->contact_info_fields =
>@@ -1093,9 +1093,9 @@ conn_contact_info_finalize (GabbleConnection *conn)
> void
> conn_contact_info_iface_init (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, gabble_connection_##x)
>   IMPLEMENT(refresh_contact_info);
>   IMPLEMENT(request_contact_info);
>diff --git a/src/conn-location.c b/src/conn-location.c
>index d111638..7250141 100644
>--- a/src/conn-location.c
>+++ b/src/conn-location.c
>@@ -158,7 +158,7 @@ request_location_reply_cb (GObject *source,
>           location = g_hash_table_new (NULL, NULL);
>         }
> 
>-      tp_svc_connection_interface_location_return_from_request_location (
>+      tp_svc_connection_interface_location1_return_from_request_location (
>           ctx->context, location);
>       g_hash_table_unref (location);
>     }
>@@ -170,7 +170,7 @@ request_location_reply_cb (GObject *source,
> 
> static void
> location_request_location (
>-    TpSvcConnectionInterfaceLocation *iface,
>+    TpSvcConnectionInterfaceLocation1 *iface,
>     TpHandle handle,
>     DBusGMethodInvocation *context)
> {
>@@ -302,7 +302,7 @@ set_location_sent_cb (GabbleConnection *conn,
> }
> 
> static void
>-location_set_location (TpSvcConnectionInterfaceLocation *iface,
>+location_set_location (TpSvcConnectionInterfaceLocation1 *iface,
>                        GHashTable *location,
>                        DBusGMethodInvocation *context)
> {
>@@ -363,9 +363,9 @@ out:
> void
> location_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceLocationClass *klass = g_iface;
>+  TpSvcConnectionInterfaceLocation1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_location_implement_##x \
>+#define IMPLEMENT(x) tp_svc_connection_interface_location1_implement_##x \
>   (klass, location_##x)
>   IMPLEMENT(set_location);
>   IMPLEMENT(request_location);
>@@ -444,7 +444,7 @@ conn_location_properties_setter (GObject *object,
>   GValue *access_control_type_value;
>   TpAccessControlType access_control_type;
>   g_return_val_if_fail (interface ==
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION, FALSE);
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION1, FALSE);
> 
>   /* There is only one property with write access. So TpDBusPropertiesMixin
>    * already checked this. */
>@@ -567,7 +567,7 @@ update_location_from_item (
>       g_hash_table_insert (location, g_strdup (mapping->tp_name), value);
>     }
> 
>-  tp_svc_connection_interface_location_emit_location_updated (conn,
>+  tp_svc_connection_interface_location1_emit_location_updated (conn,
>       contact, location);
>   gabble_presence_cache_update_location (conn->presence_cache, contact,
>       location);
>@@ -622,7 +622,7 @@ conn_location_fill_contact_attributes (GObject *obj,
>               TP_HASH_TYPE_STRING_VARIANT_MAP, location);
> 
>           tp_contacts_mixin_set_contact_attribute (attributes_hash,
>-              handle, TP_IFACE_CONNECTION_INTERFACE_LOCATION"/location", val);
>+              handle, TP_IFACE_CONNECTION_INTERFACE_LOCATION1"/location", val);
>         }
>     }
> }
>@@ -631,7 +631,7 @@ void
> conn_location_init (GabbleConnection *conn)
> {
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (conn),
>-    TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>+    TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>     conn_location_fill_contact_attributes);
> 
>   conn->pep_location = wocky_pep_service_new (NS_GEOLOC, TRUE);
>diff --git a/src/conn-mail-notif.c b/src/conn-mail-notif.c
>index 0bc7169..6042537 100644
>--- a/src/conn-mail-notif.c
>+++ b/src/conn-mail-notif.c
>@@ -115,7 +115,7 @@ return_from_request_inbox_url (GabbleConnection *conn)
>     if (error != NULL)
>       dbus_g_method_return_error (context, error);
>     else
>-      tp_svc_connection_interface_mail_notification_return_from_request_inbox_url (
>+      tp_svc_connection_interface_mail_notification1_return_from_request_inbox_url (
>           context, result);
> 
>     it = g_list_next (it);
>@@ -159,7 +159,7 @@ check_supported_or_dbus_return (GabbleConnection *conn,
> 
> static void
> gabble_mail_notification_request_inbox_url (
>-    TpSvcConnectionInterfaceMailNotification *iface,
>+    TpSvcConnectionInterfaceMailNotification1 *iface,
>     DBusGMethodInvocation *context)
> {
>   GabbleConnection *conn = GABBLE_CONNECTION (iface);
>@@ -179,7 +179,7 @@ gabble_mail_notification_request_inbox_url (
> 
> static void
> gabble_mail_notification_request_mail_url (
>-    TpSvcConnectionInterfaceMailNotification *iface,
>+    TpSvcConnectionInterfaceMailNotification1 *iface,
>     const gchar *in_id,
>     const GValue *in_url_data,
>     DBusGMethodInvocation *context)
>@@ -211,7 +211,7 @@ gabble_mail_notification_request_mail_url (
>           TP_ARRAY_TYPE_HTTP_POST_DATA_LIST, empty_array,
>           G_TYPE_INVALID);
> 
>-      tp_svc_connection_interface_mail_notification_return_from_request_mail_url (
>+      tp_svc_connection_interface_mail_notification1_return_from_request_mail_url (
>           context, result);
> 
>       g_value_array_free (result);
>@@ -457,7 +457,7 @@ store_unread_mails (GabbleConnection *conn,
>   else
>     priv->unread_count = g_hash_table_size (priv->unread_mails);
> 
>-  tp_svc_connection_interface_mail_notification_emit_unread_mails_changed (
>+  tp_svc_connection_interface_mail_notification1_emit_unread_mails_changed (
>       conn, priv->unread_count, collector.mails_added,
>       (const char **)mails_removed->pdata);
> 
>@@ -706,10 +706,10 @@ conn_mail_notif_init (GabbleConnection *conn)
>       G_CALLBACK (connection_status_changed), conn);
> 
>   g_signal_connect (conn,
>-      "clients-interested::" TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
>+      "clients-interested::" TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
>       G_CALLBACK (mail_clients_interested_cb), NULL);
>   g_signal_connect (conn,
>-      "clients-uninterested::" TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
>+      "clients-uninterested::" TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
>       G_CALLBACK (mail_clients_uninterested_cb), NULL);
> }
> 
>@@ -748,9 +748,9 @@ void
> conn_mail_notif_iface_init (gpointer g_iface,
>     gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceMailNotificationClass *klass = g_iface;
>+  TpSvcConnectionInterfaceMailNotification1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_connection_interface_mail_notification_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_connection_interface_mail_notification1_implement_##x (\
>     klass, gabble_mail_notification_##x)
>   IMPLEMENT (request_inbox_url);
>   IMPLEMENT (request_mail_url);
>diff --git a/src/conn-power-saving.c b/src/conn-power-saving.c
>index de6cc54..dd74990 100644
>--- a/src/conn-power-saving.c
>+++ b/src/conn-power-saving.c
>@@ -71,7 +71,7 @@ maybe_emit_power_saving_changed (GabbleConnection *self,
>   if (enabling != enabled)
>     {
>       g_object_set (self, "power-saving", enabling, NULL);
>-      tp_svc_connection_interface_power_saving_emit_power_saving_changed (
>+      tp_svc_connection_interface_power_saving1_emit_power_saving_changed (
>           self, enabling);
>     }
> }
>@@ -103,7 +103,7 @@ toggle_google_queueing_cb (GObject *source_object,
>     {
>       DEBUG ("%sabled queueing", enabling ? "en" : "dis");
> 
>-      tp_svc_connection_interface_power_saving_return_from_set_power_saving (
>+      tp_svc_connection_interface_power_saving1_return_from_set_power_saving (
>           queueing_context->dbus_context);
> 
>       if (!enabling)
>@@ -117,7 +117,7 @@ toggle_google_queueing_cb (GObject *source_object,
> 
> static void
> conn_power_saving_set_power_saving (
>-    TpSvcConnectionInterfacePowerSaving *conn,
>+    TpSvcConnectionInterfacePowerSaving1 *conn,
>     gboolean enable,
>     DBusGMethodInvocation *context)
> {
>@@ -132,7 +132,7 @@ conn_power_saving_set_power_saving (
>   if (enable == enabled)
>     {
>       /* no-op */
>-      tp_svc_connection_interface_power_saving_return_from_set_power_saving (
>+      tp_svc_connection_interface_power_saving1_return_from_set_power_saving (
>           context);
>       return;
>     }
>@@ -165,7 +165,7 @@ conn_power_saving_set_power_saving (
>       g_object_unref (porter);
>       maybe_emit_power_saving_changed (self, enable);
> 
>-      tp_svc_connection_interface_power_saving_return_from_set_power_saving (
>+      tp_svc_connection_interface_power_saving1_return_from_set_power_saving (
>           context);
>     }
> }
>@@ -175,7 +175,7 @@ conn_power_saving_iface_init (gpointer g_iface,
>     gpointer iface_data)
> {
> #define IMPLEMENT(x) \
>-  tp_svc_connection_interface_power_saving_implement_##x (\
>+  tp_svc_connection_interface_power_saving1_implement_##x (\
>   g_iface, conn_power_saving_##x)
>   IMPLEMENT (set_power_saving);
> #undef IMPLEMENT
>diff --git a/src/connection.c b/src/connection.c
>index 7306a53..1c1f25a 100644
>--- a/src/connection.c
>+++ b/src/connection.c
>@@ -95,40 +95,40 @@ static TpBaseContactList *_gabble_plugin_connection_get_contact_list (
> G_DEFINE_TYPE_WITH_CODE(GabbleConnection,
>     gabble_connection,
>     TP_TYPE_BASE_CONNECTION,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1,
>       conn_aliasing_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS1,
>       conn_avatars_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO1,
>       conn_contact_info_iface_init);
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>        tp_dbus_properties_mixin_iface_init);
>     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);
>     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CONNECTION_INTERFACE_GABBLE_DECLOAK,
>       conn_decloak_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION1,
>       location_iface_init);
>     G_IMPLEMENT_INTERFACE
>-      (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
>+      (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
>       gabble_conn_contact_caps_iface_init);
>     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CONNECTION_FUTURE,
>       conn_future_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
>       conn_mail_notif_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1,
>       conn_client_types_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_POWER_SAVING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_POWER_SAVING1,
>       conn_power_saving_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRESSING,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRESSING1,
>       conn_addressing_iface_init);
>     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_PLUGIN_CONNECTION,
>       gabble_plugin_connection_iface_init);
>@@ -405,7 +405,7 @@ gabble_connection_constructor (GType type,
>   DEBUG("Post-construction: (GabbleConnection *)%p", self);
> 
>   tp_base_connection_add_possible_client_interest (base,
>-      TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION);
>+      TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION1);
> 
>   self->req_pipeline = gabble_request_pipeline_new (self);
>   self->disco = gabble_disco_new (self);
>@@ -441,7 +441,7 @@ gabble_connection_constructor (GType type,
>   conn_addressing_init (self);
> 
>   tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (self),
>-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
>+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
>           conn_contact_capabilities_fill_contact_attributes);
> 
>   self->bytestream_factory = gabble_bytestream_factory_new (self);
>@@ -860,24 +860,24 @@ _gabble_connection_create_handle_repos (TpBaseConnection *conn,
> 
> static const gchar *implemented_interfaces[] = {
>     /* conditionally present interfaces */
>-    TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
>+    TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
> 
>     /* always present interfaces */
>-    TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING,
>-    TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>-    TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
>-    TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+    TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING1,
>+    TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>+    TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
>+    TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>     TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
>     TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
>-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
>-    TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
>+    TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>     GABBLE_IFACE_CONNECTION_INTERFACE_GABBLE_DECLOAK,
>     GABBLE_IFACE_CONNECTION_FUTURE,
>-    TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES,
>-    TP_IFACE_CONNECTION_INTERFACE_ADDRESSING,
>+    TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1,
>+    TP_IFACE_CONNECTION_INTERFACE_ADDRESSING1,
>     NULL
> };
> static const gchar **interfaces_always_present = implemented_interfaces + 1;
>@@ -952,17 +952,17 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class)
>         { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-        /* 0 */ { TP_IFACE_CONNECTION_INTERFACE_LOCATION,
>+        /* 0 */ { TP_IFACE_CONNECTION_INTERFACE_LOCATION1,
>           conn_location_properties_getter,
>           conn_location_properties_setter,
>           location_props,
>         },
>-        /* 1 */ { TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>+        /* 1 */ { TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
>           conn_avatars_properties_getter,
>           NULL,
>           NULL,
>         },
>-        /* 2 */ { TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
>+        /* 2 */ { TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
>           conn_contact_info_properties_getter,
>           NULL,
>           NULL,
>@@ -972,17 +972,17 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class)
>           tp_dbus_properties_mixin_setter_gobject_properties,
>           decloak_props,
>         },
>-        { TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
>+        { TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
>           conn_mail_notif_properties_getter,
>           NULL,
>           mail_notif_props,
>         },
>-        { TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING,
>+        { TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING1,
>           tp_dbus_properties_mixin_getter_gobject_properties,
>           NULL,
>           power_saving_props,
>         },
>-        { TP_IFACE_CONNECTION_INTERFACE_ALIASING,
>+        { TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
>           conn_aliasing_properties_getter,
>           NULL,
>           conn_aliasing_properties,
>@@ -2777,7 +2777,7 @@ set_status_to_connected (GabbleConnection *conn)
>   if (conn->features & GABBLE_CONNECTION_FEATURES_GOOGLE_MAIL_NOTIFY)
>     {
>        const gchar *ifaces[] =
>-         { TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION, NULL };
>+         { TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1, NULL };
> 
>       tp_base_connection_add_interfaces ((TpBaseConnection *) conn, ifaces);
>     }
>@@ -2785,7 +2785,7 @@ set_status_to_connected (GabbleConnection *conn)
>   if (tp_base_contact_list_can_block (gabble_connection_get_contact_list (conn)))
>     {
>       const gchar *ifaces[] =
>-        { TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING, NULL };
>+        { TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1, NULL };
> 
>       tp_base_connection_add_interfaces ((TpBaseConnection *) conn, ifaces);
>     }
>@@ -3119,7 +3119,7 @@ _emit_capabilities_changed (GabbleConnection *conn,
>       (GDestroyNotify) gabble_free_rcc_list);
>   g_hash_table_insert (hash, GUINT_TO_POINTER (handle), caps_arr);
> 
>-  tp_svc_connection_interface_contact_capabilities_emit_contact_capabilities_changed (
>+  tp_svc_connection_interface_contact_capabilities1_emit_contact_capabilities_changed (
>       conn, hash);
> 
>   g_hash_table_unref (hash);
>@@ -3289,7 +3289,7 @@ check_data_form_is_valid (GabbleConnection *self,
>  */
> static void
> gabble_connection_update_capabilities (
>-    TpSvcConnectionInterfaceContactCapabilities *iface,
>+    TpSvcConnectionInterfaceContactCapabilities1 *iface,
>     const GPtrArray *clients,
>     DBusGMethodInvocation *context)
> {
>@@ -3409,7 +3409,7 @@ gabble_connection_update_capabilities (
>       gabble_capability_set_free (old_caps);
>     }
> 
>-  tp_svc_connection_interface_contact_capabilities_return_from_update_capabilities (
>+  tp_svc_connection_interface_contact_capabilities1_return_from_update_capabilities (
>       context);
> }
> 
>@@ -3429,7 +3429,7 @@ conn_contact_capabilities_fill_contact_attributes (GObject *obj,
> 
>       tp_contacts_mixin_set_contact_attribute (attributes_hash,
>           handle,
>-          TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES"/capabilities",
>+          TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1"/capabilities",
>           val);
>     }
> }
>@@ -3518,10 +3518,10 @@ gabble_connection_send_presence (GabbleConnection *conn,
> static void
> gabble_conn_contact_caps_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcConnectionInterfaceContactCapabilitiesClass *klass = g_iface;
>+  TpSvcConnectionInterfaceContactCapabilities1Class *klass = g_iface;
> 
> #define IMPLEMENT(x) \
>-    tp_svc_connection_interface_contact_capabilities_implement_##x (\
>+    tp_svc_connection_interface_contact_capabilities1_implement_##x (\
>     klass, gabble_connection_##x)
>   IMPLEMENT(update_capabilities);
> #undef IMPLEMENT
>diff --git a/src/ft-channel.c b/src/ft-channel.c
>index ae65e41..5aa3432 100644
>--- a/src/ft-channel.c
>+++ b/src/ft-channel.c
>@@ -63,11 +63,11 @@ static gboolean set_gtalk_file_collection (GabbleFileTransferChannel *self,
> 
> G_DEFINE_TYPE_WITH_CODE (GabbleFileTransferChannel, gabble_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 (GABBLE_TYPE_SVC_CHANNEL_TYPE_FILETRANSFER_FUTURE,
>                            NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1,
>                            NULL);
> );
> 
>@@ -144,7 +144,7 @@ struct _GabbleFileTransferChannelPrivate {
> };
> 
> static void gabble_file_transfer_channel_set_state (
>-    TpSvcChannelTypeFileTransfer *iface, TpFileTransferState state,
>+    TpSvcChannelTypeFileTransfer1 *iface, TpFileTransferState state,
>     TpFileTransferStateChangeReason reason);
> static void close_session_and_transport (GabbleFileTransferChannel *self);
> 
>@@ -157,7 +157,7 @@ gabble_file_transfer_channel_close (TpBaseChannel *base)
>       self->priv->state != TP_FILE_TRANSFER_STATE_CANCELLED)
>     {
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_CANCELLED,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED);
> 
>@@ -271,7 +271,7 @@ gabble_file_transfer_channel_set_property (GObject *object,
>     {
>       case PROP_STATE:
>         gabble_file_transfer_channel_set_state (
>-            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (object),
>+            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (object),
>             g_value_get_uint (value),
>             TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
>         break;
>@@ -373,7 +373,7 @@ connection_presences_updated_cb (GabblePresenceCache *cache,
>                   DEBUG ("peer disconnected. FileTransfer is cancelled");
> 
>                   gabble_file_transfer_channel_set_state (
>-                      TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+                      TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>                       TP_FILE_TRANSFER_STATE_CANCELLED,
>                       TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED);
>                 }
>@@ -461,7 +461,7 @@ file_transfer_channel_properties_setter (GObject *object,
>   GabbleFileTransferChannel *self = (GabbleFileTransferChannel *) object;
>   TpBaseChannel *base = TP_BASE_CHANNEL (self);
> 
>-  g_return_val_if_fail (interface == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER,
>+  g_return_val_if_fail (interface == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER1,
>       FALSE);
> 
>   /* There is only one property with write access. So TpDBusPropertiesMixin
>@@ -494,7 +494,7 @@ file_transfer_channel_properties_setter (GObject *object,
> 
>   self->priv->uri = g_value_dup_string (value);
> 
>-  tp_svc_channel_type_file_transfer_emit_uri_defined (self, self->priv->uri);
>+  tp_svc_channel_type_file_transfer1_emit_uri_defined (self, self->priv->uri);
> 
>   return TRUE;
> }
>@@ -510,27 +510,27 @@ gabble_file_transfer_channel_fill_immutable_properties (TpBaseChannel *chan,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "State",
>-      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, "ContentHashType",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentHash",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Description",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Date",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "TransferredBytes",
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "InitialOffset",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "State",
>+      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, "ContentHashType",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "ContentHash",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "Description",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "Date",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "AvailableSocketTypes",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "TransferredBytes",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "InitialOffset",
>       GABBLE_IFACE_CHANNEL_TYPE_FILETRANSFER_FUTURE, "FileCollection",
>-      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "ServiceName",
>-      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "Metadata",
>+      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1, "ServiceName",
>+      TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1, "Metadata",
>       NULL);
> 
>   /* URI is immutable only for outgoing transfers */
>   if (tp_base_channel_is_requested (chan))
>     {
>       tp_dbus_properties_mixin_fill_properties_hash (G_OBJECT (chan), properties,
>-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "URI", NULL);
>+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1, "URI", NULL);
>     }
> }
> 
>@@ -549,7 +549,7 @@ gabble_file_transfer_channel_get_interfaces (TpBaseChannel *base)
>       gabble_file_transfer_channel_parent_class)->get_interfaces (base);
> 
>   g_ptr_array_add (interfaces, GABBLE_IFACE_CHANNEL_TYPE_FILETRANSFER_FUTURE);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1);
> 
>   return interfaces;
> }
>@@ -592,7 +592,7 @@ gabble_file_transfer_channel_class_init (
>   };
> 
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-    { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
>+    { TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       file_transfer_channel_properties_setter,
>       file_props
>@@ -602,7 +602,7 @@ gabble_file_transfer_channel_class_init (
>       NULL,
>       file_future_props
>     },
>-    { TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA,
>+    { TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       file_metadata_props
>@@ -619,7 +619,7 @@ gabble_file_transfer_channel_class_init (
>   object_class->get_property = gabble_file_transfer_channel_get_property;
>   object_class->set_property = gabble_file_transfer_channel_set_property;
> 
>-  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->get_interfaces = gabble_file_transfer_channel_get_interfaces;
>   base_class->close = gabble_file_transfer_channel_close;
>@@ -908,7 +908,7 @@ static gboolean setup_local_socket (GabbleFileTransferChannel *self,
> 
> static void
> gabble_file_transfer_channel_set_state (
>-    TpSvcChannelTypeFileTransfer *iface,
>+    TpSvcChannelTypeFileTransfer1 *iface,
>     TpFileTransferState state,
>     TpFileTransferStateChangeReason reason)
> {
>@@ -918,7 +918,7 @@ gabble_file_transfer_channel_set_state (
>     return;
> 
>   self->priv->state = state;
>-  tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed (iface,
>+  tp_svc_channel_type_file_transfer1_emit_file_transfer_state_changed (iface,
>       state, reason);
> }
> 
>@@ -971,11 +971,11 @@ channel_open (GabbleFileTransferChannel *self)
>   if (self->priv->socket_address != NULL)
>     {
>       /* ProvideFile has already been called. Channel is Open */
>-      tp_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
>+      tp_svc_channel_type_file_transfer1_emit_initial_offset_defined (self,
>           self->priv->initial_offset);
> 
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_OPEN,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
> 
>@@ -986,7 +986,7 @@ channel_open (GabbleFileTransferChannel *self)
>     {
>       /* Client has to call ProvideFile to open the channel */
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_ACCEPTED,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
>     }
>@@ -1003,7 +1003,7 @@ bytestream_closed (GabbleFileTransferChannel *self)
> 
>       /* Something did wrong */
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_CANCELLED,
>           receiver ?
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR :
>@@ -1091,7 +1091,7 @@ bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
>     {
>       DEBUG ("receiver refused file offer");
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_CANCELLED,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED);
>       return;
>@@ -1280,7 +1280,7 @@ gabble_file_transfer_channel_gtalk_file_collection_state_changed (
>     {
>       case GTALK_FILE_COLLECTION_STATE_PENDING:
>         gabble_file_transfer_channel_set_state (
>-            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>             TP_FILE_TRANSFER_STATE_PENDING,
>             TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
>         break;
>@@ -1288,7 +1288,7 @@ gabble_file_transfer_channel_gtalk_file_collection_state_changed (
>         if (self->priv->state == TP_FILE_TRANSFER_STATE_PENDING)
>           {
>             gabble_file_transfer_channel_set_state (
>-                TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+                TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>                 TP_FILE_TRANSFER_STATE_ACCEPTED,
>                 TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
>           }
>@@ -1301,7 +1301,7 @@ gabble_file_transfer_channel_gtalk_file_collection_state_changed (
>             self->priv->state != TP_FILE_TRANSFER_STATE_CANCELLED)
>           {
>             gabble_file_transfer_channel_set_state (
>-                TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+                TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>                 TP_FILE_TRANSFER_STATE_CANCELLED,
>                 local_terminator ?
>                 TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED:
>@@ -1312,7 +1312,7 @@ gabble_file_transfer_channel_gtalk_file_collection_state_changed (
>       case GTALK_FILE_COLLECTION_STATE_ERROR:
>       case GTALK_FILE_COLLECTION_STATE_CONNECTION_FAILED:
>         gabble_file_transfer_channel_set_state (
>-            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>             TP_FILE_TRANSFER_STATE_CANCELLED,
>             TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR);
> 
>@@ -1320,7 +1320,7 @@ gabble_file_transfer_channel_gtalk_file_collection_state_changed (
>         break;
>       case GTALK_FILE_COLLECTION_STATE_COMPLETED:
>         gabble_file_transfer_channel_set_state (
>-            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+            TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>             TP_FILE_TRANSFER_STATE_COMPLETED,
>             TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
> 
>@@ -1491,12 +1491,12 @@ gabble_file_transfer_channel_offer_file (GabbleFileTransferChannel *self,
> static void
> emit_progress_update (GabbleFileTransferChannel *self)
> {
>-  TpSvcChannelTypeFileTransfer *iface =
>-      TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self);
>+  TpSvcChannelTypeFileTransfer1 *iface =
>+      TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self);
> 
>   g_get_current_time (&self->priv->last_transferred_bytes_emitted);
> 
>-  tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed (
>+  tp_svc_channel_type_file_transfer1_emit_transferred_bytes_changed (
>     iface, self->priv->transferred_bytes);
> 
>   if (self->priv->progress_timer != 0)
>@@ -1585,7 +1585,7 @@ data_received_cb (GabbleFileTransferChannel *self, const guint8 *data, guint len
>       g_error_free (error);
> 
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_CANCELLED,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR);
>       return;
>@@ -1599,7 +1599,7 @@ data_received_cb (GabbleFileTransferChannel *self, const guint8 *data, guint len
>     {
>       DEBUG ("Received all the file. Transfer is complete");
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_COMPLETED,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
> 
>@@ -1674,7 +1674,7 @@ augment_si_reply (WockyNode *si,
>  * on interface Channel.Type.FileTransfer
>  */
> static void
>-gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer *iface,
>+gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
>                                           guint address_type,
>                                           guint access_control,
>                                           const GValue *access_control_param,
>@@ -1726,7 +1726,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer *iface,
>       TP_FILE_TRANSFER_STATE_ACCEPTED,
>       TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
> 
>-  tp_svc_channel_type_file_transfer_return_from_accept_file (context,
>+  tp_svc_channel_type_file_transfer1_return_from_accept_file (context,
>       self->priv->socket_address);
> 
>   if (self->priv->resume_supported)
>@@ -1776,7 +1776,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer *iface,
>  */
> static void
> gabble_file_transfer_channel_provide_file (
>-    TpSvcChannelTypeFileTransfer *iface,
>+    TpSvcChannelTypeFileTransfer1 *iface,
>     guint address_type,
>     guint access_control,
>     const GValue *access_control_param,
>@@ -1836,7 +1836,7 @@ gabble_file_transfer_channel_provide_file (
>     {
>       /* Remote already accepted the file. Channel is Open.
>        * If not channel stay Pending. */
>-      tp_svc_channel_type_file_transfer_emit_initial_offset_defined (self,
>+      tp_svc_channel_type_file_transfer1_emit_initial_offset_defined (self,
>           self->priv->initial_offset);
> 
>       gabble_file_transfer_channel_set_state (iface,
>@@ -1844,7 +1844,7 @@ gabble_file_transfer_channel_provide_file (
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED);
>     }
> 
>-  tp_svc_channel_type_file_transfer_return_from_provide_file (context,
>+  tp_svc_channel_type_file_transfer1_return_from_provide_file (context,
>       self->priv->socket_address);
> }
> 
>@@ -1852,10 +1852,10 @@ static void
> file_transfer_iface_init (gpointer g_iface,
>                           gpointer iface_data)
> {
>-  TpSvcChannelTypeFileTransferClass *klass =
>-      (TpSvcChannelTypeFileTransferClass *) g_iface;
>+  TpSvcChannelTypeFileTransfer1Class *klass =
>+      (TpSvcChannelTypeFileTransfer1Class *) g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_type_file_transfer_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_type_file_transfer1_implement_##x (\
>     klass, gabble_file_transfer_channel_##x)
>   IMPLEMENT (accept_file);
>   IMPLEMENT (provide_file);
>@@ -1935,7 +1935,7 @@ transport_handler (GibberTransport *transport,
>         {
>           DEBUG ("All the file has been sent. Closing the bytestream");
>           gabble_file_transfer_channel_set_state (
>-              TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+              TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>               TP_FILE_TRANSFER_STATE_COMPLETED,
>               TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
>           gabble_bytestream_iface_close (self->priv->bytestream, NULL);
>@@ -2019,7 +2019,7 @@ transport_disconnected_cb (GibberTransport *transport,
>     {
> 
>       gabble_file_transfer_channel_set_state (
>-          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER (self),
>+          TP_SVC_CHANNEL_TYPE_FILE_TRANSFER1 (self),
>           TP_FILE_TRANSFER_STATE_CANCELLED,
>           TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR);
> 
>diff --git a/src/ft-manager.c b/src/ft-manager.c
>index cca26d4..5b6d4b5 100644
>--- a/src/ft-manager.c
>+++ b/src/ft-manager.c
>@@ -462,7 +462,7 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>   /* We only support file transfer channels */
>   if (tp_strdiff (tp_asv_get_string (request_properties,
>           TP_IFACE_CHANNEL ".ChannelType"),
>-        TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
>+        TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1))
>     return FALSE;
> 
>   /* And only contact handles */
>@@ -486,7 +486,7 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>     }
> 
>   content_type = tp_asv_get_string (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType");
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".ContentType");
>   if (content_type == NULL)
>     {
>       g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
>@@ -495,7 +495,7 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>     }
> 
>   filename = tp_asv_get_string (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename");
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".Filename");
>   if (filename == NULL)
>     {
>       g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
>@@ -504,7 +504,7 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>     }
> 
>   size = tp_asv_get_uint64 (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size", NULL);
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".Size", NULL);
>   if (size == 0)
>     {
>       g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
>@@ -513,7 +513,7 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>     }
> 
>   content_hash_type = tp_asv_get_uint32 (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType", &valid);
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".ContentHashType", &valid);
>   if (!valid)
>     {
>       /* Assume File_Hash_Type_None */
>@@ -532,7 +532,7 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>   if (content_hash_type != TP_FILE_HASH_TYPE_NONE)
>     {
>       content_hash = tp_asv_get_string (request_properties,
>-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHash");
>+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".ContentHash");
>       if (content_hash == NULL)
>         {
>           g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
>@@ -547,22 +547,22 @@ gabble_ft_manager_handle_request (TpChannelManager *manager,
>     }
> 
>   description = tp_asv_get_string (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Description");
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".Description");
> 
>   date = tp_asv_get_uint64 (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date", NULL);
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".Date", NULL);
> 
>   initial_offset = tp_asv_get_uint64 (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".InitialOffset", NULL);
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".InitialOffset", NULL);
> 
>   file_uri = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI);
>+      TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI);
> 
>   service_name = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME);
>+      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME);
> 
>   metadata = tp_asv_get_boxed (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
>+      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_METADATA,
>       TP_HASH_TYPE_METADATA);
> 
>   if (metadata != NULL && g_hash_table_lookup ((GHashTable *) metadata, "FORM_TYPE"))
>@@ -609,16 +609,16 @@ static const gchar * const file_transfer_channel_fixed_properties[] = {
> 
>    /* ContentHashType has to be first so we can easily skip it when needed */
> #define STANDARD_PROPERTIES \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH_TYPE, \
>    TP_PROP_CHANNEL_TARGET_HANDLE, \
>    TP_PROP_CHANNEL_TARGET_ID, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, \
>-   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DESCRIPTION, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, \
>+   TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI
> 
> static const gchar * const file_transfer_channel_allowed_properties[] =
> {
>@@ -629,15 +629,15 @@ static const gchar * const file_transfer_channel_allowed_properties[] =
> static const gchar * const file_transfer_channel_allowed_properties_with_metadata_prop[] =
> {
>   STANDARD_PROPERTIES,
>-  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
>+  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_METADATA,
>   NULL
> };
> 
> static const gchar * const file_transfer_channel_allowed_properties_with_both_metadata_props[] =
> {
>   STANDARD_PROPERTIES,
>-  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME,
>-  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
>+  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME,
>+  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_METADATA,
>   NULL
> };
> 
>@@ -653,7 +653,7 @@ gabble_ft_manager_type_foreach_channel_class (GType type,
>       NULL, (GDestroyNotify) tp_g_value_slice_free);
> 
>   g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType" ,
>-      tp_g_value_slice_new_string (TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER));
>+      tp_g_value_slice_new_string (TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1));
> 
>   g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
>       tp_g_value_slice_new_uint (TP_HANDLE_TYPE_CONTACT));
>@@ -663,7 +663,7 @@ gabble_ft_manager_type_foreach_channel_class (GType type,
> 
>   /* MD5 HashType class */
>   g_hash_table_insert (table,
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType",
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1 ".ContentHashType",
>       tp_g_value_slice_new_uint (TP_FILE_HASH_TYPE_MD5));
> 
>   /* skip ContentHashType in allowed properties */
>@@ -949,7 +949,7 @@ add_file_transfer_channel_class (GPtrArray *arr,
>       (GDestroyNotify) tp_g_value_slice_free);
> 
>   channel_type_value = tp_g_value_slice_new_static_string (
>-      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
>+      TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
>   g_hash_table_insert (fixed_properties, TP_IFACE_CHANNEL ".ChannelType",
>       channel_type_value);
> 
>@@ -961,7 +961,7 @@ add_file_transfer_channel_class (GPtrArray *arr,
>     {
>       service_name_value = tp_g_value_slice_new_string (service_name_str);
>       g_hash_table_insert (fixed_properties,
>-          TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME,
>+          TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME,
>           service_name_value);
>     }
> 
>@@ -1037,7 +1037,7 @@ gabble_ft_manager_represent_client (
> 
>       if (tp_strdiff (tp_asv_get_string (channel_class,
>               TP_IFACE_CHANNEL ".ChannelType"),
>-            TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
>+            TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1))
>         continue;
> 
>       if (tp_asv_get_uint32 (channel_class,
>@@ -1060,7 +1060,7 @@ gabble_ft_manager_represent_client (
>         continue;
> 
>       service_name = tp_asv_get_string (channel_class,
>-          TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME);
>+          TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME);
> 
>       if (service_name == NULL)
>         continue;
>diff --git a/src/im-channel.c b/src/im-channel.c
>index c30877d..3106e72 100644
>--- a/src/im-channel.c
>+++ b/src/im-channel.c
>@@ -45,9 +45,9 @@ G_DEFINE_TYPE_WITH_CODE (GabbleIMChannel, gabble_im_channel,
>     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));
> 
> static void _gabble_im_channel_send_message (GObject *object,
>@@ -90,8 +90,8 @@ gabble_im_channel_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_im_channel_parent_class)->get_interfaces (base);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1);
> 
>   return interfaces;
> }
>@@ -661,7 +661,7 @@ gabble_im_channel_close (TpBaseChannel *base_chan)
>  * on interface Channel.Interface.Destroyable
>  */
> static void
>-gabble_im_channel_destroy (TpSvcChannelInterfaceDestroyable *iface,
>+gabble_im_channel_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
>                            DBusGMethodInvocation *context)
> {
>   g_assert (GABBLE_IS_IM_CHANNEL (iface));
>@@ -670,7 +670,7 @@ gabble_im_channel_destroy (TpSvcChannelInterfaceDestroyable *iface,
>   tp_message_mixin_clear ((GObject *) iface);
>   gabble_im_channel_close (TP_BASE_CHANNEL (iface));
> 
>-  tp_svc_channel_interface_destroyable_return_from_destroy (context);
>+  tp_svc_channel_interface_destroyable1_return_from_destroy (context);
> }
> 
> static gboolean
>@@ -697,9 +697,9 @@ static void
> destroyable_iface_init (gpointer g_iface,
>                         gpointer iface_data)
> {
>-  TpSvcChannelInterfaceDestroyableClass *klass = g_iface;
>+  TpSvcChannelInterfaceDestroyable1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_destroyable_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_interface_destroyable1_implement_##x (\
>     klass, gabble_im_channel_##x)
>   IMPLEMENT(destroy);
> #undef IMPLEMENT
>diff --git a/src/media-factory.c b/src/media-factory.c
>index 7f7744c..8908da1 100644
>--- a/src/media-factory.c
>+++ b/src/media-factory.c
>@@ -426,40 +426,40 @@ static const gchar * const media_channel_fixed_properties[] = {
> static const gchar * const call_channel_allowed_properties[] = {
>     TP_PROP_CHANNEL_TARGET_HANDLE,
>     TP_PROP_CHANNEL_TARGET_ID,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME,
>-    TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_MUTABLE_CONTENTS,
>     NULL
> };
> 
> static const gchar * const call_audio_allowed[] = {
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME,
>     NULL
> };
> 
> static const gchar * const call_video_allowed[] = {
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME,
>     NULL
> };
> 
> static const gchar * const call_both_allowed[] = {
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME,
>-    TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_MUTABLE_CONTENTS,
>     NULL
> };
> 
> static const gchar * const call_both_allowed_immutable[] = {
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
>-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
>+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME,
>     NULL
> };
> 
>@@ -484,7 +484,7 @@ gabble_media_factory_call_channel_class (void)
>       NULL);
> 
>   tp_asv_set_static_string (table, TP_PROP_CHANNEL_CHANNEL_TYPE,
>-      TP_IFACE_CHANNEL_TYPE_CALL);
>+      TP_IFACE_CHANNEL_TYPE_CALL1);
> 
>   return table;
> }
>@@ -522,7 +522,7 @@ gabble_media_factory_create_call (TpChannelManager *manager,
> 
>   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;
> 
>   DEBUG ("Creating a new call channel");
>@@ -579,9 +579,9 @@ gabble_media_factory_create_call (TpChannelManager *manager,
>     }
> 
>   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)
>     {
>@@ -596,9 +596,9 @@ gabble_media_factory_create_call (TpChannelManager *manager,
>    */
> 
>   initial_audio_name = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME);
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME);
>   initial_video_name = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME);
>+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME);
> 
>   new_call_channel (self, NULL, target,
>     initial_audio, initial_audio_name,
>@@ -840,11 +840,11 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
>   if (G_UNLIKELY (qc_gtalk_p2p == 0))
>     {
>       qc_gtalk_p2p = g_quark_from_static_string (
>-          TP_IFACE_CHANNEL_TYPE_CALL "/gtalk-p2p");
>+          TP_IFACE_CHANNEL_TYPE_CALL1 "/gtalk-p2p");
>       qc_ice_udp = g_quark_from_static_string (
>-          TP_IFACE_CHANNEL_TYPE_CALL "/ice-udp");
>+          TP_IFACE_CHANNEL_TYPE_CALL1 "/ice-udp");
>       qc_h264 = g_quark_from_static_string (
>-          TP_IFACE_CHANNEL_TYPE_CALL "/video/h264");
>+          TP_IFACE_CHANNEL_TYPE_CALL1 "/video/h264");
>     }
> 
>   if (cap_tokens != NULL)
>@@ -887,7 +887,7 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
> 
>       if (tp_strdiff (tp_asv_get_string (filter,
>               TP_PROP_CHANNEL_CHANNEL_TYPE),
>-            TP_IFACE_CHANNEL_TYPE_CALL))
>+            TP_IFACE_CHANNEL_TYPE_CALL1))
>         {
>           /* not interesting to this channel manager */
>           continue;
>@@ -905,11 +905,11 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
>         }
> 
>       if (tp_asv_get_boolean (filter,
>-            TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL))
>+            TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL))
>         audio = TRUE;
> 
>       if (tp_asv_get_boolean (filter,
>-            TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL))
>+            TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL))
>         video = TRUE;
> 
>       /* If we've picked up all the capabilities we're ever going to, then
>diff --git a/src/muc-channel.c b/src/muc-channel.c
>index ec2d4b1..2b4cfc9 100644
>--- a/src/muc-channel.c
>+++ b/src/muc-channel.c
>@@ -70,19 +70,19 @@ static void muc_call_channel_finish_requests (GabbleMucChannel *self,
> 
> G_DEFINE_TYPE_WITH_CODE (GabbleMucChannel, gabble_muc_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    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_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_CONFERENCE, NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM, NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CONFERENCE1, NULL);
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM1, NULL);
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1,
>       tp_base_room_config_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SUBJECT,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SUBJECT1,
>       subject_iface_init);
>     )
> 
>@@ -230,13 +230,13 @@ gabble_muc_channel_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_muc_channel_parent_class)->get_interfaces (base);
> 
>-  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_CHAT_STATE);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CONFERENCE);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_ROOM);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG);
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SUBJECT);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_PASSWORD1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_ROOM1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SUBJECT1);
> 
>   return interfaces;
> }
>@@ -1029,16 +1029,16 @@ gabble_muc_channel_fill_immutable_properties (
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE, "InitialChannels",
>-      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE, "InitialInviteeHandles",
>-      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE, "InitialInviteeIDs",
>-      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE, "InvitationMessage",
>+      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1, "InitialChannels",
>+      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1, "InitialInviteeHandles",
>+      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1, "InitialInviteeIDs",
>+      TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1, "InvitationMessage",
>       TP_IFACE_CHANNEL_TYPE_TEXT, "MessagePartSupportFlags",
>       TP_IFACE_CHANNEL_TYPE_TEXT, "DeliveryReportingSupport",
>       TP_IFACE_CHANNEL_TYPE_TEXT, "SupportedContentTypes",
>       TP_IFACE_CHANNEL_TYPE_TEXT, "MessageTypes",
>-      TP_IFACE_CHANNEL_INTERFACE_ROOM, "RoomName",
>-      TP_IFACE_CHANNEL_INTERFACE_ROOM, "Server",
>+      TP_IFACE_CHANNEL_INTERFACE_ROOM1, "RoomName",
>+      TP_IFACE_CHANNEL_INTERFACE_ROOM1, "Server",
>       NULL);
> }
> 
>@@ -1068,17 +1068,17 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class)
>   };
> 
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-    { TP_IFACE_CHANNEL_INTERFACE_CONFERENCE,
>+    { TP_IFACE_CHANNEL_INTERFACE_CONFERENCE1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       conference_props,
>     },
>-    { TP_IFACE_CHANNEL_INTERFACE_ROOM,
>+    { TP_IFACE_CHANNEL_INTERFACE_ROOM1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       room_props,
>     },
>-    { TP_IFACE_CHANNEL_INTERFACE_SUBJECT,
>+    { TP_IFACE_CHANNEL_INTERFACE_SUBJECT1,
>       tp_dbus_properties_mixin_getter_gobject_properties,
>       NULL,
>       subject_props,
>@@ -1441,7 +1441,7 @@ change_must_provide_password (
>   DEBUG ("emitting password flags changed, added 0x%X, removed 0x%X",
>           added, removed);
> 
>-  tp_svc_channel_interface_password_emit_password_flags_changed (
>+  tp_svc_channel_interface_password1_emit_password_flags_changed (
>       chan, added, removed);
> }
> 
>@@ -1549,7 +1549,7 @@ return_from_set_subject (
>   GabbleMucChannelPrivate *priv = self->priv;
> 
>   if (error == NULL)
>-    tp_svc_channel_interface_subject_return_from_set_subject (
>+    tp_svc_channel_interface_subject1_return_from_set_subject (
>         priv->set_subject_context);
>   else
>     dbus_g_method_return_error (priv->set_subject_context, error);
>@@ -1842,7 +1842,7 @@ emit_subject_changed (GabbleMucChannel *chan)
>   const gchar *changed[] = { "Subject", "Actor", "Timestamp", NULL };
> 
>   tp_dbus_properties_mixin_emit_properties_changed (G_OBJECT (chan),
>-      TP_IFACE_CHANNEL_INTERFACE_SUBJECT, changed);
>+      TP_IFACE_CHANNEL_INTERFACE_SUBJECT1, changed);
> }
> 
> static void
>@@ -2073,18 +2073,18 @@ gabble_muc_channel_tube_request (GabbleMucChannel *self,
>   channel_type = tp_asv_get_string (request_properties,
>       TP_PROP_CHANNEL_CHANNEL_TYPE);
> 
>-  if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
>+  if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1))
>     {
>       type = TUBE_TYPE_STREAM;
>       service = tp_asv_get_string (request_properties,
>-          TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+          TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
> 
>     }
>-  else if (! tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
>+  else if (! tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1))
>     {
>       type = TUBE_TYPE_DBUS;
>       service = tp_asv_get_string (request_properties,
>-          TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+          TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
>     }
>   else
>     /* This assertion is safe: this function's caller only calls it in one of
>@@ -3197,7 +3197,7 @@ gabble_muc_channel_close (TpBaseChannel *base)
>  * on interface Channel.Interface.Password
>  */
> static void
>-gabble_muc_channel_get_password_flags (TpSvcChannelInterfacePassword *iface,
>+gabble_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 *iface,
>                                        DBusGMethodInvocation *context)
> {
>   GabbleMucChannel *self = GABBLE_MUC_CHANNEL (iface);
>@@ -3207,7 +3207,7 @@ gabble_muc_channel_get_password_flags (TpSvcChannelInterfacePassword *iface,
> 
>   priv = self->priv;
> 
>-  tp_svc_channel_interface_password_return_from_get_password_flags (context,
>+  tp_svc_channel_interface_password1_return_from_get_password_flags (context,
>       priv->must_provide_password ? TP_CHANNEL_PASSWORD_FLAG_PROVIDE : 0);
> }
> 
>@@ -3222,7 +3222,7 @@ gabble_muc_channel_get_password_flags (TpSvcChannelInterfacePassword *iface,
>  *           or throw an error.
>  */
> static void
>-gabble_muc_channel_provide_password (TpSvcChannelInterfacePassword *iface,
>+gabble_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *iface,
>                                      const gchar *password,
>                                      DBusGMethodInvocation *context)
> {
>@@ -4164,7 +4164,7 @@ sent_subject_cb (
> }
> 
> static void
>-gabble_muc_channel_set_subject (TpSvcChannelInterfaceSubject *iface,
>+gabble_muc_channel_set_subject (TpSvcChannelInterfaceSubject1 *iface,
>     const gchar *subject,
>     DBusGMethodInvocation *context)
> {
>@@ -4225,10 +4225,10 @@ gabble_muc_channel_set_subject (TpSvcChannelInterfaceSubject *iface,
> static void
> password_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcChannelInterfacePasswordClass *klass =
>-    (TpSvcChannelInterfacePasswordClass *) g_iface;
>+  TpSvcChannelInterfacePassword1Class *klass =
>+    (TpSvcChannelInterfacePassword1Class *) g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_password_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_interface_password1_implement_##x (\
>     klass, gabble_muc_channel_##x)
>   IMPLEMENT(get_password_flags);
>   IMPLEMENT(provide_password);
>@@ -4238,10 +4238,10 @@ password_iface_init (gpointer g_iface, gpointer iface_data)
> static void
> subject_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcChannelInterfaceSubjectClass *klass =
>-    (TpSvcChannelInterfaceSubjectClass *) g_iface;
>+  TpSvcChannelInterfaceSubject1Class *klass =
>+    (TpSvcChannelInterfaceSubject1Class *) g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_interface_subject_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_interface_subject1_implement_##x (\
>     klass, gabble_muc_channel_##x)
>   IMPLEMENT(set_subject);
> #undef IMPLEMENT
>diff --git a/src/muc-factory.c b/src/muc-factory.c
>index 6b61b72..c6b0215 100644
>--- a/src/muc-factory.c
>+++ b/src/muc-factory.c
>@@ -1104,12 +1104,12 @@ static const gchar * const * muc_tubes_channel_fixed_properties =
> static const gchar * const muc_channel_allowed_properties[] = {
>     TP_PROP_CHANNEL_TARGET_HANDLE,
>     TP_PROP_CHANNEL_TARGET_ID,
>-    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_ROOM_ROOM_NAME,
>-    TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER,
>+    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_ROOM1_ROOM_NAME,
>+    TP_PROP_CHANNEL_INTERFACE_ROOM1_SERVER,
>     NULL
> };
> 
>@@ -1139,20 +1139,20 @@ gabble_muc_factory_type_foreach_channel_class (GType type,
> 
>   /* Muc Channel.Type.StreamTube */
>   g_value_set_static_string (channel_type_value,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   func (type, table, gabble_tube_stream_channel_get_allowed_properties (),
>       user_data);
> 
>   /* Muc Channel.Type.DBusTube */
>   g_value_set_static_string (channel_type_value,
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1);
>   func (type, table, gabble_tube_dbus_channel_get_allowed_properties (),
>       user_data);
> 
> #ifdef ENABLE_VOIP
>   /* Muc Channel.Type.Call */
>   g_value_set_static_string (channel_type_value,
>-      TP_IFACE_CHANNEL_TYPE_CALL);
>+      TP_IFACE_CHANNEL_TYPE_CALL1);
>   func (type, table,
>       gabble_media_factory_call_channel_allowed_properties (),
>       user_data);
>@@ -1196,21 +1196,21 @@ handle_text_channel_request (GabbleMucFactory *self,
>     return FALSE;
> 
>   initial_channels = tp_asv_get_boxed (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS,
>+      TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_CHANNELS,
>       TP_ARRAY_TYPE_OBJECT_PATH_LIST);
>   initial_handles = tp_asv_get_boxed (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_HANDLES,
>+      TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_HANDLES,
>       DBUS_TYPE_G_UINT_ARRAY);
>   initial_ids = tp_asv_get_boxed (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS,
>+      TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_IDS,
>       G_TYPE_STRV);
>   invite_msg = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INVITATION_MESSAGE);
>+      TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INVITATION_MESSAGE);
> 
>   room_name = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME);
>+      TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME);
>   server_prop = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER);
>+      TP_PROP_CHANNEL_INTERFACE_ROOM1_SERVER);
> 
>   handles = tp_handle_set_new (contact_handles);
>   continue_handles = tp_intset_new ();
>@@ -1584,12 +1584,12 @@ handle_stream_tube_channel_request (GabbleMucFactory *self,
> 
>   /* "Service" is a mandatory, not-fixed property */
>   service = tp_asv_get_string (request_properties,
>-            TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+            TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
>   if (service == NULL)
>     {
>       g_set_error (error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
>           "Request does not contain the mandatory property '%s'",
>-          TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+          TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
>       return FALSE;
>     }
> 
>@@ -1615,12 +1615,12 @@ handle_dbus_tube_channel_request (GabbleMucFactory *self,
> 
>   /* "ServiceName" is a mandatory, not-fixed property */
>   service = tp_asv_get_string (request_properties,
>-      TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+      TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
>   if (service == NULL)
>     {
>       g_set_error (error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
>           "Request does not contain the mandatory property '%s'",
>-          TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+          TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
>       return FALSE;
>     }
> 
>@@ -1676,9 +1676,9 @@ handle_call_channel_request (GabbleMucFactory *self,
>     return FALSE;
> 
>   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)
>     {
>@@ -1742,10 +1742,10 @@ typedef struct {
> 
> static ChannelTypeHandler channel_type_handlers[] = {
>     { TP_IFACE_CHANNEL_TYPE_TEXT, handle_text_channel_request },
>-    { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, handle_stream_tube_channel_request },
>-    { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, handle_dbus_tube_channel_request },
>+    { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1, handle_stream_tube_channel_request },
>+    { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1, handle_dbus_tube_channel_request },
> #ifdef ENABLE_VOIP
>-    { TP_IFACE_CHANNEL_TYPE_CALL, handle_call_channel_request },
>+    { TP_IFACE_CHANNEL_TYPE_CALL1, handle_call_channel_request },
> #endif
>     { NULL }
> };
>@@ -1772,16 +1772,16 @@ gabble_muc_factory_request (GabbleMucFactory *self,
>   conference = (handle_type == TP_HANDLE_TYPE_NONE &&
>       !tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT) &&
>       (g_hash_table_lookup (request_properties,
>-         TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS) ||
>+         TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_CHANNELS) ||
>        g_hash_table_lookup (request_properties,
>-         TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_HANDLES) ||
>+         TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_HANDLES) ||
>        g_hash_table_lookup (request_properties,
>-         TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS)));
>+         TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_IDS)));
> 
>   room = (handle_type == TP_HANDLE_TYPE_NONE
>       && !tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)
>       && g_hash_table_lookup (request_properties,
>-          TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME));
>+          TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME));
> 
>   /* the channel must either be a room, or a new conference */
>   if (handle_type != TP_HANDLE_TYPE_ROOM && !conference && !room)
>diff --git a/src/muc-tube-dbus.c b/src/muc-tube-dbus.c
>index 6ba1d82..11fcf71 100644
>--- a/src/muc-tube-dbus.c
>+++ b/src/muc-tube-dbus.c
>@@ -32,7 +32,7 @@ gabble_muc_tube_dbus_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_muc_tube_dbus_parent_class)->get_interfaces (base);
> 
>-  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/src/muc-tube-stream.c b/src/muc-tube-stream.c
>index 96448ab..21dad79 100644
>--- a/src/muc-tube-stream.c
>+++ b/src/muc-tube-stream.c
>@@ -32,7 +32,7 @@ gabble_muc_tube_stream_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_muc_tube_stream_parent_class)->get_interfaces (base);
> 
>-  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/src/private-tubes-factory.c b/src/private-tubes-factory.c
>index b70f1b0..61861fc 100644
>--- a/src/private-tubes-factory.c
>+++ b/src/private-tubes-factory.c
>@@ -409,10 +409,10 @@ add_service_to_array (const gchar *service,
>   channel_type_value = tp_g_value_slice_new (G_TYPE_STRING);
>   if (type == TUBE_TYPE_STREAM)
>     g_value_set_static_string (channel_type_value,
>-        TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+        TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   else
>     g_value_set_static_string (channel_type_value,
>-        TP_IFACE_CHANNEL_TYPE_DBUS_TUBE);
>+        TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1);
>   g_hash_table_insert (fixed_properties, TP_PROP_CHANNEL_CHANNEL_TYPE,
>       channel_type_value);
> 
>@@ -425,11 +425,11 @@ add_service_to_array (const gchar *service,
>   g_value_set_string (target_handle_type_value, service);
>   if (type == TUBE_TYPE_STREAM)
>     g_hash_table_insert (fixed_properties,
>-        TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE,
>+        TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE,
>         target_handle_type_value);
>   else
>     g_hash_table_insert (fixed_properties,
>-        TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME,
>+        TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME,
>         target_handle_type_value);
> 
>   dbus_g_type_struct_set (&monster,
>@@ -461,7 +461,7 @@ add_generic_tube_caps (GPtrArray *arr)
> 
>   channel_type_value = tp_g_value_slice_new (G_TYPE_STRING);
>   g_value_set_static_string (channel_type_value,
>-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
> 
>   g_hash_table_insert (fixed_properties, TP_PROP_CHANNEL_CHANNEL_TYPE,
>       channel_type_value);
>@@ -490,7 +490,7 @@ add_generic_tube_caps (GPtrArray *arr)
> 
>   channel_type_value = tp_g_value_slice_new (G_TYPE_STRING);
>   g_value_set_static_string (channel_type_value,
>-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE);
>+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1);
> 
>   g_hash_table_insert (fixed_properties, TP_PROP_CHANNEL_CHANNEL_TYPE,
>       channel_type_value);
>@@ -577,26 +577,26 @@ gabble_private_tubes_factory_add_cap (GabbleCapsChannelManager *manager,
>             TP_PROP_CHANNEL_CHANNEL_TYPE);
> 
>   /* this channel is not for this factory */
>-  if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE) &&
>-      tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
>+  if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1) &&
>+      tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1))
>     return;
> 
>   if (tp_asv_get_uint32 (cap,
>         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_HANDLE_TYPE_CONTACT)
>     return;
> 
>-  if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
>+  if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1))
>     {
>       service = tp_asv_get_string (cap,
>-          TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+          TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
> 
>       if (service != NULL)
>         ns = g_strconcat (STREAM_CAP_PREFIX, service, NULL);
>     }
>-  else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
>+  else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1))
>     {
>       service = tp_asv_get_string (cap,
>-          TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+          TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
> 
>       if (service != NULL)
>         ns = g_strconcat (DBUS_CAP_PREFIX, service, NULL);
>@@ -1024,10 +1024,10 @@ new_channel_from_request (GabblePrivateTubesFactory *self,
>   parameters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
>       (GDestroyNotify) tp_g_value_slice_free);
> 
>-  if (!tp_strdiff (ctype, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
>+  if (!tp_strdiff (ctype, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1))
>     {
>       service = tp_asv_get_string (request,
>-          TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+          TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
> 
>       tube = GABBLE_TUBE_IFACE (gabble_tube_stream_new (self->priv->conn,
>               handle, handle_type,
>@@ -1035,10 +1035,10 @@ new_channel_from_request (GabblePrivateTubesFactory *self,
>               tp_base_connection_get_self_handle (base_conn),
>               service, parameters, tube_id, NULL, TRUE));
>     }
>-  else if (!tp_strdiff (ctype, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
>+  else if (!tp_strdiff (ctype, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1))
>     {
>       service = tp_asv_get_string (request,
>-          TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+          TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
> 
>       stream_id = gabble_bytestream_factory_generate_stream_id ();
> 
>@@ -1213,7 +1213,7 @@ gabble_private_tubes_factory_type_foreach_channel_class (GType type,
>       (GDestroyNotify) tp_g_value_slice_free);
> 
>   value = tp_g_value_slice_new (G_TYPE_STRING);
>-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE);
>+  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
>   g_hash_table_insert (table, TP_PROP_CHANNEL_CHANNEL_TYPE,
>       value);
> 
>@@ -1232,7 +1232,7 @@ gabble_private_tubes_factory_type_foreach_channel_class (GType type,
>       (GDestroyNotify) tp_g_value_slice_free);
> 
>   value = tp_g_value_slice_new (G_TYPE_STRING);
>-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE);
>+  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1);
>   g_hash_table_insert (table, TP_PROP_CHANNEL_CHANNEL_TYPE,
>       value);
> 
>@@ -1268,11 +1268,11 @@ gabble_private_tubes_factory_requestotron (GabblePrivateTubesFactory *self,
>   channel_type = tp_asv_get_string (request_properties,
>             TP_PROP_CHANNEL_CHANNEL_TYPE);
> 
>-  if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE) &&
>-      tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
>+  if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1) &&
>+      tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1))
>     return FALSE;
> 
>-  if (! tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE))
>+  if (! tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1))
>     {
>       if (tp_channel_manager_asv_has_unknown_properties (request_properties,
>               tubes_channel_fixed_properties,
>@@ -1282,16 +1282,16 @@ gabble_private_tubes_factory_requestotron (GabblePrivateTubesFactory *self,
> 
>       /* "Service" is a mandatory, not-fixed property */
>       service = tp_asv_get_string (request_properties,
>-                TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+                TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
>       if (service == NULL)
>         {
>           g_set_error (&error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
>               "Request does not contain the mandatory property '%s'",
>-              TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE);
>+              TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE);
>           goto error;
>         }
>     }
>-  else if (! tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE))
>+  else if (! tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1))
>     {
>       GError *err = NULL;
> 
>@@ -1303,12 +1303,12 @@ gabble_private_tubes_factory_requestotron (GabblePrivateTubesFactory *self,
> 
>       /* "ServiceName" is a mandatory, not-fixed property */
>       service = tp_asv_get_string (request_properties,
>-                TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+                TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
>       if (service == NULL)
>         {
>           g_set_error (&error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
>               "Request does not contain the mandatory property '%s'",
>-              TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME);
>+              TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME);
>           goto error;
>         }
> 
>diff --git a/src/protocol.c b/src/protocol.c
>index d89b8a1..1dedaa3 100644
>--- a/src/protocol.c
>+++ b/src/protocol.c
>@@ -162,7 +162,7 @@ static TpCMParamSpec jabber_params[] = {
>     TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT, GUINT_TO_POINTER (30),
>     0 /* unused */, NULL, NULL },
> 
>-  { TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_DOWNLOAD_AT_CONNECTION,
>+  { TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_DOWNLOAD_AT_CONNECTION,
>     DBUS_TYPE_BOOLEAN_AS_STRING, G_TYPE_BOOLEAN,
>     TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT | TP_CONN_MGR_PARAM_FLAG_DBUS_PROPERTY,
>     GUINT_TO_POINTER (TRUE),
>@@ -255,7 +255,7 @@ struct ParamMapping {
>   SAME ("alias"),
>   SAME ("fallback-socks5-proxies"),
>   SAME ("keepalive-interval"),
>-  MAP (TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_DOWNLOAD_AT_CONNECTION,
>+  MAP (TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST1_DOWNLOAD_AT_CONNECTION,
>        "download-roster-at-connection"),
>   MAP (GABBLE_PROP_CONNECTION_INTERFACE_GABBLE_DECLOAK_DECLOAK_AUTOMATICALLY,
>        "decloak-automatically"),
>@@ -329,9 +329,9 @@ get_interfaces_array (TpBaseProtocol *self)
>   interfaces = TP_BASE_PROTOCOL_CLASS (
>       gabble_jabber_protocol_parent_class)->get_interfaces_array (self);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_PRESENCE);
>-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING);
>-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS);
>+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1);
>+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1);
>+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS1);
> 
>   return interfaces;
> }
>@@ -395,8 +395,8 @@ static GStrv
> dup_authentication_types (TpBaseProtocol *self)
> {
>   const gchar * const types[] = {
>-    TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
>-    TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+    TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1,
>+    TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>     NULL };
> 
>   return g_strdupv ((GStrv) types);
>diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
>index e5b981c..dfa7ec7 100644
>--- a/src/roomlist-channel.c
>+++ b/src/roomlist-channel.c
>@@ -40,7 +40,7 @@ static void roomlist_iface_init (gpointer, gpointer);
> 
> G_DEFINE_TYPE_WITH_CODE (GabbleRoomlistChannel, gabble_roomlist_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST1,
>       roomlist_iface_init);
>     );
> 
>@@ -153,7 +153,7 @@ gabble_roomlist_channel_fill_immutable_properties (
> 
>   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);
> }
> 
>@@ -182,7 +182,7 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *klass)
>   object_class->dispose = gabble_roomlist_channel_dispose;
>   object_class->finalize = gabble_roomlist_channel_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->get_object_path_suffix =
>       gabble_roomlist_channel_get_object_path_suffix;
>@@ -199,7 +199,7 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *klass)
>       param_spec);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       roomlist_props);
> }
>@@ -279,8 +279,8 @@ emit_room_signal (gpointer data)
>   if (priv->pending_room_signals->len == 0)
>       return TRUE;
> 
>-  tp_svc_channel_type_room_list_emit_got_rooms (
>-      (TpSvcChannelTypeRoomList *) chan, priv->pending_room_signals);
>+  tp_svc_channel_type_room_list1_emit_got_rooms (
>+      (TpSvcChannelTypeRoomList1 *) chan, priv->pending_room_signals);
> 
>   while (priv->pending_room_signals->len != 0)
>     {
>@@ -431,8 +431,8 @@ rooms_end_cb (gpointer data, gpointer user_data)
>   emit_room_signal (chan);
> 
>   priv->listing = FALSE;
>-  tp_svc_channel_type_room_list_emit_listing_rooms (
>-      (TpSvcChannelTypeRoomList *) chan, FALSE);
>+  tp_svc_channel_type_room_list1_emit_listing_rooms (
>+      (TpSvcChannelTypeRoomList1 *) chan, FALSE);
> 
>   g_source_remove (priv->timer_source_id);
>   priv->timer_source_id = 0;
>@@ -448,8 +448,8 @@ stop_listing (GabbleRoomlistChannel *self)
>     {
>       emit_room_signal (self);
>       priv->listing = FALSE;
>-      tp_svc_channel_type_room_list_emit_listing_rooms (
>-          (TpSvcChannelTypeRoomList *) self, FALSE);
>+      tp_svc_channel_type_room_list1_emit_listing_rooms (
>+          (TpSvcChannelTypeRoomList1 *) self, FALSE);
>     }
> 
>   if (priv->disco_pipeline != NULL)
>@@ -479,7 +479,7 @@ gabble_roomlist_channel_close (TpBaseChannel *base)
> }
> 
> static void
>-gabble_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList *iface,
>+gabble_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface,
>                                            DBusGMethodInvocation *context)
> {
>   GabbleRoomlistChannel *self = GABBLE_ROOMLIST_CHANNEL (iface);
>@@ -488,12 +488,12 @@ gabble_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList *iface,
>   g_assert (GABBLE_IS_ROOMLIST_CHANNEL (self));
> 
>   priv = self->priv;
>-  tp_svc_channel_type_room_list_return_from_get_listing_rooms (
>+  tp_svc_channel_type_room_list1_return_from_get_listing_rooms (
>       context, priv->listing);
> }
> 
> static void
>-gabble_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList *iface,
>+gabble_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface,
>                                     DBusGMethodInvocation *context)
> {
>   GabbleRoomlistChannel *self = GABBLE_ROOMLIST_CHANNEL (iface);
>@@ -503,7 +503,7 @@ gabble_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList *iface,
>       GABBLE_CONNECTION (tp_base_channel_get_connection (base));
> 
>   priv->listing = TRUE;
>-  tp_svc_channel_type_room_list_emit_listing_rooms (iface, TRUE);
>+  tp_svc_channel_type_room_list1_emit_listing_rooms (iface, TRUE);
> 
>   if (priv->disco_pipeline == NULL)
>     priv->disco_pipeline = gabble_disco_pipeline_init (conn->disco,
>@@ -514,11 +514,11 @@ gabble_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList *iface,
>   priv->timer_source_id = g_timeout_add (ROOM_SIGNAL_INTERVAL,
>       emit_room_signal, 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
>-gabble_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList *iface,
>+gabble_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface,
>                                       DBusGMethodInvocation *context)
> {
>   GabbleRoomlistChannel *self = GABBLE_ROOMLIST_CHANNEL (iface);
>@@ -527,16 +527,16 @@ gabble_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList *iface,
> 
>   stop_listing (self);
> 
>-  tp_svc_channel_type_room_list_return_from_stop_listing (context);
>+  tp_svc_channel_type_room_list1_return_from_stop_listing (context);
> }
> 
> static void
> roomlist_iface_init (gpointer g_iface, gpointer iface_data)
> {
>-  TpSvcChannelTypeRoomListClass *klass =
>-    (TpSvcChannelTypeRoomListClass *) g_iface;
>+  TpSvcChannelTypeRoomList1Class *klass =
>+    (TpSvcChannelTypeRoomList1Class *) g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_type_room_list_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_type_room_list1_implement_##x (\
>     klass, gabble_roomlist_channel_##x)
>   IMPLEMENT(get_listing_rooms);
>   IMPLEMENT(list_rooms);
>diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c
>index ff2f37f..79cba5d 100644
>--- a/src/roomlist-manager.c
>+++ b/src/roomlist-manager.c
>@@ -263,7 +263,7 @@ static const gchar * const roomlist_channel_fixed_properties[] = {
> };
> 
> static const gchar * const roomlist_channel_allowed_properties[] = {
>-    TP_IFACE_CHANNEL_TYPE_ROOM_LIST ".Server",
>+    TP_IFACE_CHANNEL_TYPE_ROOM_LIST1 ".Server",
>     NULL
> };
> 
>@@ -278,7 +278,7 @@ gabble_roomlist_manager_type_foreach_channel_class (GType type,
>   GValue *value;
> 
>   value = tp_g_value_slice_new (G_TYPE_STRING);
>-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_ROOM_LIST);
>+  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_ROOM_LIST1);
>   g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
> 
>   value = tp_g_value_slice_new (G_TYPE_UINT);
>@@ -322,7 +322,7 @@ gabble_roomlist_manager_handle_request (TpChannelManager *manager,
> 
>   if (tp_strdiff (tp_asv_get_string (request_properties,
>           TP_IFACE_CHANNEL ".ChannelType"),
>-        TP_IFACE_CHANNEL_TYPE_ROOM_LIST))
>+        TP_IFACE_CHANNEL_TYPE_ROOM_LIST1))
>     return FALSE;
> 
>   if (tp_asv_get_uint32 (request_properties,
>@@ -340,7 +340,7 @@ gabble_roomlist_manager_handle_request (TpChannelManager *manager,
>     goto error;
> 
>   server = tp_asv_get_string (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_ROOM_LIST ".Server");
>+      TP_IFACE_CHANNEL_TYPE_ROOM_LIST1 ".Server");
> 
>   if (server == NULL || server[0] == '\0')
>     {
>diff --git a/src/search-channel.c b/src/search-channel.c
>index 0c253ba..f229c66 100644
>--- a/src/search-channel.c
>+++ b/src/search-channel.c
>@@ -96,7 +96,7 @@ static void contact_search_iface_init (gpointer, gpointer);
> 
> G_DEFINE_TYPE_WITH_CODE (GabbleSearchChannel, gabble_search_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH1,
>         contact_search_iface_init);
>     )
> 
>@@ -502,7 +502,7 @@ change_search_state (GabbleSearchChannel *chan,
>       states[state], error_name == NULL ? "" : error_name);
>   priv->state = state;
> 
>-  tp_svc_channel_type_contact_search_emit_search_state_changed (
>+  tp_svc_channel_type_contact_search1_emit_search_state_changed (
>       chan, state, (error_name == NULL ? "" : error_name), details);
> 
>   g_hash_table_unref (details);
>@@ -807,7 +807,7 @@ search_reply_cb (GabbleConnection *conn,
>   if (err == NULL)
>     {
>       /* fire SearchStateChanged */
>-      tp_svc_channel_type_contact_search_emit_search_result_received (chan,
>+      tp_svc_channel_type_contact_search1_emit_search_result_received (chan,
>           chan->priv->results);
> 
>       change_search_state (chan, TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED,
>@@ -1110,9 +1110,9 @@ gabble_search_channel_fill_immutable_properties (
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "AvailableSearchKeys",
>-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "Server",
>-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "Limit",
>+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1, "AvailableSearchKeys",
>+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1, "Server",
>+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1, "Limit",
>       NULL);
> }
> 
>@@ -1151,7 +1151,7 @@ gabble_search_channel_class_init (GabbleSearchChannelClass *klass)
>   object_class->get_property = gabble_search_channel_get_property;
>   object_class->set_property = gabble_search_channel_set_property;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1;
>   base_class->target_handle_type = TP_HANDLE_TYPE_NONE;
>   base_class->fill_immutable_properties =
>       gabble_search_channel_fill_immutable_properties;
>@@ -1209,7 +1209,7 @@ gabble_search_channel_class_init (GabbleSearchChannelClass *klass)
>                   G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING);
> 
>   tp_dbus_properties_mixin_implement_interface (object_class,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       search_channel_props);
> 
>@@ -1217,7 +1217,7 @@ gabble_search_channel_class_init (GabbleSearchChannelClass *klass)
> }
> 
> static void
>-gabble_search_channel_search (TpSvcChannelTypeContactSearch *self,
>+gabble_search_channel_search (TpSvcChannelTypeContactSearch1 *self,
>                               GHashTable *terms,
>                               DBusGMethodInvocation *context)
> {
>@@ -1234,7 +1234,7 @@ gabble_search_channel_search (TpSvcChannelTypeContactSearch *self,
> 
>   if (do_search (chan, terms, &error))
>     {
>-      tp_svc_channel_type_contact_search_return_from_search (context);
>+      tp_svc_channel_type_contact_search1_return_from_search (context);
>       return;
>     }
> 
>@@ -1244,7 +1244,7 @@ err:
> }
> 
> static void
>-gabble_search_channel_stop (TpSvcChannelTypeContactSearch *self,
>+gabble_search_channel_stop (TpSvcChannelTypeContactSearch1 *self,
>                             DBusGMethodInvocation *context)
> {
>   GabbleSearchChannel *chan = GABBLE_SEARCH_CHANNEL (self);
>@@ -1262,7 +1262,7 @@ gabble_search_channel_stop (TpSvcChannelTypeContactSearch *self,
>         }
>       case TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED:
>       case TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED:
>-        tp_svc_channel_type_contact_search_return_from_stop (context);
>+        tp_svc_channel_type_contact_search1_return_from_stop (context);
>         break;
>       case TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED:
>         {
>@@ -1287,9 +1287,9 @@ static void
> contact_search_iface_init (gpointer g_iface,
>                            gpointer iface_data)
> {
>-  TpSvcChannelTypeContactSearchClass *klass = g_iface;
>+  TpSvcChannelTypeContactSearch1Class *klass = g_iface;
> 
>-#define IMPLEMENT(x) tp_svc_channel_type_contact_search_implement_##x (\
>+#define IMPLEMENT(x) tp_svc_channel_type_contact_search1_implement_##x (\
>     klass, gabble_search_channel_##x)
>   IMPLEMENT(search);
>   IMPLEMENT(stop);
>diff --git a/src/search-manager.c b/src/search-manager.c
>index e0af6eb..15cfc58 100644
>--- a/src/search-manager.c
>+++ b/src/search-manager.c
>@@ -319,7 +319,7 @@ static const gchar * const search_channel_fixed_properties[] = {
> };
> 
> static const gchar * const search_channel_allowed_properties[] = {
>-    TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH ".Server",
>+    TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1 ".Server",
>     NULL
> };
> 
>@@ -334,7 +334,7 @@ gabble_search_manager_type_foreach_channel_class (GType type,
>   GValue *value;
> 
>   value = tp_g_value_slice_new_string (
>-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH);
>+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1);
>   g_hash_table_insert (table, (gchar *) search_channel_fixed_properties[0],
>       value);
> 
>@@ -471,7 +471,7 @@ gabble_search_manager_create_channel (TpChannelManager *manager,
>   channel_type = tp_asv_get_string (request_properties,
>       TP_IFACE_CHANNEL ".ChannelType");
> 
>-  if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH))
>+  if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1))
>     return FALSE;
> 
>   if (tp_channel_manager_asv_has_unknown_properties (request_properties,
>@@ -480,7 +480,7 @@ gabble_search_manager_create_channel (TpChannelManager *manager,
>     goto error;
> 
>   server = tp_asv_get_string (request_properties,
>-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH ".Server");
>+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH1 ".Server");
> 
>   if (tp_str_empty (server))
>     {
>diff --git a/src/server-sasl-channel.c b/src/server-sasl-channel.c
>index 9ff8505..376de3c 100644
>--- a/src/server-sasl-channel.c
>+++ b/src/server-sasl-channel.c
>@@ -52,11 +52,11 @@ static void sasl_auth_iface_init (gpointer, gpointer);
> G_DEFINE_TYPE_WITH_CODE (GabbleServerSaslChannel, gabble_server_sasl_channel,
>     TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (
>-        TP_TYPE_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION,
>+        TP_TYPE_SVC_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
>         NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABLE, NULL);
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABLE1, NULL);
>     G_IMPLEMENT_INTERFACE (
>-        TP_TYPE_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+        TP_TYPE_SVC_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>         sasl_auth_iface_init));
> 
> enum
>@@ -106,8 +106,8 @@ gabble_server_sasl_channel_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_server_sasl_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_SECURABLE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SECURABLE1);
> 
>   return interfaces;
> }
>@@ -136,18 +136,18 @@ gabble_server_sasl_channel_fill_immutable_properties (TpBaseChannel *channel,
> 
>   tp_dbus_properties_mixin_fill_properties_hash (G_OBJECT (channel),
>       properties,
>-      TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION, "AuthenticationMethod",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+      TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1, "AuthenticationMethod",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>           "AvailableMechanisms",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "HasInitialData",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, "CanTryAgain",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+      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_AUTHENTICATION, "DefaultRealm",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1, "DefaultRealm",
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>           "DefaultUsername",
>-      TP_IFACE_CHANNEL_INTERFACE_SECURABLE, "Encrypted",
>-      TP_IFACE_CHANNEL_INTERFACE_SECURABLE, "Verified",
>+      TP_IFACE_CHANNEL_INTERFACE_SECURABLE1, "Encrypted",
>+      TP_IFACE_CHANNEL_INTERFACE_SECURABLE1, "Verified",
>       NULL);
> }
> 
>@@ -181,7 +181,7 @@ gabble_server_sasl_channel_get_property (GObject *object,
>       break;
>     case PROP_AUTH_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, priv->available_mechanisms);
>@@ -311,17 +311,17 @@ gabble_server_sasl_channel_class_init (GabbleServerSaslChannelClass *klass)
>     { 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_auth_props,
>       },
>-      { TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+      { TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         sasl_auth_props,
>       },
>-      { TP_IFACE_CHANNEL_INTERFACE_SECURABLE,
>+      { TP_IFACE_CHANNEL_INTERFACE_SECURABLE1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         securable_props,
>@@ -339,7 +339,7 @@ gabble_server_sasl_channel_class_init (GabbleServerSaslChannelClass *klass)
>   object_class->finalize = gabble_server_sasl_channel_finalize;
> 
>   channel_class->channel_type =
>-    TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION;
>+    TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1;
>   channel_class->get_interfaces = gabble_server_sasl_channel_get_interfaces;
>   channel_class->target_handle_type = TP_HANDLE_TYPE_NONE;
>   channel_class->fill_immutable_properties =
>@@ -351,7 +351,7 @@ gabble_server_sasl_channel_class_init (GabbleServerSaslChannelClass *klass)
>   param_spec = g_param_spec_string ("auth-method",
>       "Authentication method",
>       "Method of authentication (D-Bus interface)",
>-      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
>+      TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
>       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
>   g_object_class_install_property (object_class, PROP_AUTH_METHOD,
>       param_spec);
>@@ -458,7 +458,7 @@ change_current_state (GabbleServerSaslChannel *self,
> {
>   self->priv->sasl_status = status;
> 
>-  tp_svc_channel_interface_sasl_authentication_emit_sasl_status_changed (
>+  tp_svc_channel_interface_sasl_authentication1_emit_sasl_status_changed (
>       self, self->priv->sasl_status,
>       self->priv->sasl_error,
>       self->priv->sasl_error_details);
>@@ -512,7 +512,7 @@ gabble_server_sasl_channel_raise (DBusGMethodInvocation *context,
>  * from D-Bus as StartMechanismWithData, it can't. */
> static void
> gabble_server_sasl_channel_start_mechanism_with_data (
>-    TpSvcChannelInterfaceSASLAuthentication *iface,
>+    TpSvcChannelInterfaceSASLAuthentication1 *iface,
>     const gchar *in_Mechanism,
>     const GArray *in_InitialData,
>     DBusGMethodInvocation *context)
>@@ -578,7 +578,7 @@ gabble_server_sasl_channel_start_mechanism_with_data (
> 
> static void
> gabble_server_sasl_channel_start_mechanism (
>-    TpSvcChannelInterfaceSASLAuthentication *iface,
>+    TpSvcChannelInterfaceSASLAuthentication1 *iface,
>     const gchar *mech,
>     DBusGMethodInvocation *context)
> {
>@@ -588,7 +588,7 @@ gabble_server_sasl_channel_start_mechanism (
> 
> static void
> gabble_server_sasl_channel_respond (
>-    TpSvcChannelInterfaceSASLAuthentication *channel,
>+    TpSvcChannelInterfaceSASLAuthentication1 *channel,
>     const GArray *in_Response_Data,
>     DBusGMethodInvocation *context)
> {
>@@ -632,13 +632,13 @@ gabble_server_sasl_channel_respond (
>       (GDestroyNotify) wocky_g_string_free);
>   complete_operation (self, TRUE);
> 
>-  tp_svc_channel_interface_sasl_authentication_return_from_respond (
>+  tp_svc_channel_interface_sasl_authentication1_return_from_respond (
>       context);
> }
> 
> static void
> gabble_server_sasl_channel_accept_sasl (
>-    TpSvcChannelInterfaceSASLAuthentication *channel,
>+    TpSvcChannelInterfaceSASLAuthentication1 *channel,
>     DBusGMethodInvocation *context)
> {
>   GabbleServerSaslChannel *self = GABBLE_SERVER_SASL_CHANNEL (channel);
>@@ -722,13 +722,13 @@ gabble_server_sasl_channel_accept_sasl (
>       complete_operation (self, FALSE);
>     }
> 
>-  tp_svc_channel_interface_sasl_authentication_return_from_accept_sasl (
>+  tp_svc_channel_interface_sasl_authentication1_return_from_accept_sasl (
>       context);
> }
> 
> static void
> gabble_server_sasl_channel_abort_sasl (
>-    TpSvcChannelInterfaceSASLAuthentication *channel,
>+    TpSvcChannelInterfaceSASLAuthentication1 *channel,
>     guint in_Reason,
>     const gchar *in_Debug_Message,
>     DBusGMethodInvocation *context)
>@@ -805,7 +805,7 @@ gabble_server_sasl_channel_abort_sasl (
>         g_assert_not_reached ();
>     }
> 
>-  tp_svc_channel_interface_sasl_authentication_return_from_abort_sasl (
>+  tp_svc_channel_interface_sasl_authentication1_return_from_abort_sasl (
>       context);
> }
> 
>@@ -814,7 +814,7 @@ sasl_auth_iface_init (gpointer klass,
>     gpointer unused G_GNUC_UNUSED)
> {
> #define IMPLEMENT(x) \
>-  tp_svc_channel_interface_sasl_authentication_implement_##x (   \
>+  tp_svc_channel_interface_sasl_authentication1_implement_##x (   \
>       klass, gabble_server_sasl_channel_##x)
>   IMPLEMENT (start_mechanism);
>   IMPLEMENT (start_mechanism_with_data);
>@@ -878,7 +878,7 @@ gabble_server_sasl_channel_challenge_async (GabbleServerSaslChannel *self,
>         g_array_append_vals (challenge_ay, challenge_data->str,
>             challenge_data->len);
> 
>-        tp_svc_channel_interface_sasl_authentication_emit_new_challenge (
>+        tp_svc_channel_interface_sasl_authentication1_emit_new_challenge (
>             self, challenge_ay);
>         break;
>       case TP_SASL_STATUS_CLIENT_FAILED:
>diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
>index aae0aad..e8bcee0 100644
>--- a/src/server-tls-channel.c
>+++ b/src/server-tls-channel.c
>@@ -34,7 +34,7 @@
> 
> G_DEFINE_TYPE_WITH_CODE (GabbleServerTLSChannel, gabble_server_tls_channel,
>     TP_TYPE_BASE_CHANNEL,
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION1,
>         NULL));
> 
> static void gabble_server_tls_channel_close (TpBaseChannel *base);
>@@ -212,9 +212,9 @@ gabble_server_tls_channel_fill_immutable_properties (
> 
>   tp_dbus_properties_mixin_fill_properties_hash (
>       G_OBJECT (chan), properties,
>-      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, "ServerCertificate",
>-      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, "Hostname",
>-      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, "ReferenceIdentities",
>+      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1, "ServerCertificate",
>+      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1, "Hostname",
>+      TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1, "ReferenceIdentities",
>       NULL);
> }
> 
>@@ -255,7 +255,7 @@ gabble_server_tls_channel_class_init (GabbleServerTLSChannelClass *klass)
>   oclass->finalize = gabble_server_tls_channel_finalize;
>   oclass->constructed = gabble_server_tls_channel_constructed;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1;
>   base_class->target_handle_type = TP_HANDLE_TYPE_NONE;
>   base_class->fill_immutable_properties =
>       gabble_server_tls_channel_fill_immutable_properties;
>@@ -289,7 +289,7 @@ gabble_server_tls_channel_class_init (GabbleServerTLSChannelClass *klass)
>   g_object_class_install_property (oclass, PROP_TLS_SESSION, pspec);
> 
>   tp_dbus_properties_mixin_implement_interface (oclass,
>-      TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
>+      TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION1,
>       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
>       server_tls_props);
> }
>diff --git a/src/tube-dbus.c b/src/tube-dbus.c
>index 0132ec4..3db077d 100644
>--- a/src/tube-dbus.c
>+++ b/src/tube-dbus.c
>@@ -62,18 +62,18 @@ static void dbustube_iface_init (gpointer g_iface, gpointer iface_data);
> G_DEFINE_TYPE_WITH_CODE (GabbleTubeDBus, gabble_tube_dbus,
>     TP_TYPE_BASE_CHANNEL,
>     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_TUBE_IFACE, tube_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE1,
>       dbustube_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE1,
>       NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>       tp_external_group_mixin_iface_init);
> );
> 
> static const gchar * const gabble_tube_dbus_channel_allowed_properties[] = {
>     TP_IFACE_CHANNEL ".TargetHandle",
>     TP_IFACE_CHANNEL ".TargetID",
>-    TP_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName",
>+    TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1 ".ServiceName",
>     NULL
> };
> 
>@@ -163,7 +163,7 @@ gabble_tube_dbus_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_tube_dbus_parent_class)->get_interfaces (base);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE1);
> 
>   return interfaces;
> }
>@@ -503,7 +503,7 @@ bytestream_state_changed_cb (GabbleBytestreamIface *bytestream,
>     {
>       tube_dbus_open (self);
> 
>-      tp_svc_channel_interface_tube_emit_tube_channel_state_changed (self,
>+      tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (self,
>           TP_TUBE_CHANNEL_STATE_OPEN);
> 
>       g_signal_emit (G_OBJECT (self), signals[OPENED], 0);
>@@ -818,15 +818,15 @@ gabble_tube_dbus_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))
>     {
>       tp_dbus_properties_mixin_fill_properties_hash (
>           G_OBJECT (chan), properties,
>-          TP_IFACE_CHANNEL_INTERFACE_TUBE, "Parameters",
>+          TP_IFACE_CHANNEL_INTERFACE_TUBE1, "Parameters",
>           NULL);
>     }
> }
>@@ -856,12 +856,12 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
>       { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
>+      { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         dbus_tube_props,
>       },
>-      { TP_IFACE_CHANNEL_INTERFACE_TUBE,
>+      { TP_IFACE_CHANNEL_INTERFACE_TUBE1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         tube_iface_props,
>@@ -878,7 +878,7 @@ gabble_tube_dbus_class_init (GabbleTubeDBusClass *gabble_tube_dbus_class)
>   object_class->dispose = gabble_tube_dbus_dispose;
>   object_class->finalize = gabble_tube_dbus_finalize;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_DBUS_TUBE;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1;
>   base_class->get_interfaces = gabble_tube_dbus_get_interfaces;
>   base_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
>   base_class->close = gabble_tube_dbus_close;
>@@ -1094,7 +1094,7 @@ gabble_tube_dbus_offer (GabbleTubeDBus *tube,
>       g_object_unref (msg);
>       g_free (full_jid);
> 
>-      tp_svc_channel_interface_tube_emit_tube_channel_state_changed (tube,
>+      tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (tube,
>           TP_TUBE_CHANNEL_STATE_REMOTE_PENDING);
>     }
>   else
>@@ -1516,7 +1516,7 @@ gabble_tube_dbus_add_name (GabbleTubeDBus *self,
> 
>   g_hash_table_insert (added, GUINT_TO_POINTER (handle), (gchar *) name);
> 
>-  tp_svc_channel_type_dbus_tube_emit_dbus_names_changed (self, added,
>+  tp_svc_channel_type_dbus_tube1_emit_dbus_names_changed (self, added,
>       removed);
> 
>   g_hash_table_unref (added);
>@@ -1554,7 +1554,7 @@ gabble_tube_dbus_remove_name (GabbleTubeDBus *self,
> 
>   g_array_append_val (removed, handle);
> 
>-  tp_svc_channel_type_dbus_tube_emit_dbus_names_changed (self, added,
>+  tp_svc_channel_type_dbus_tube1_emit_dbus_names_changed (self, added,
>       removed);
> 
>   g_hash_table_unref (added);
>@@ -1659,7 +1659,7 @@ gabble_tube_dbus_check_access_control (GabbleTubeDBus *self,
>  * Channel.Type.DBusTube
>  */
> static void
>-gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube *self,
>+gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self,
>     GHashTable *parameters,
>     guint access_control,
>     DBusGMethodInvocation *context)
>@@ -1681,7 +1681,7 @@ gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube *self,
> 
>   if (gabble_tube_dbus_offer (tube, &error))
>     {
>-      tp_svc_channel_type_dbus_tube_return_from_offer (context,
>+      tp_svc_channel_type_dbus_tube1_return_from_offer (context,
>           tube->priv->dbus_srv_addr);
>     }
>   else
>@@ -1699,7 +1699,7 @@ gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube *self,
>  * Channel.Type.DBusTube
>  */
> static void
>-gabble_tube_dbus_accept_async (TpSvcChannelTypeDBusTube *self,
>+gabble_tube_dbus_accept_async (TpSvcChannelTypeDBusTube1 *self,
>     guint access_control,
>     DBusGMethodInvocation *context)
> {
>@@ -1715,7 +1715,7 @@ gabble_tube_dbus_accept_async (TpSvcChannelTypeDBusTube *self,
> 
>   if (gabble_tube_dbus_accept (GABBLE_TUBE_IFACE (tube), &error))
>     {
>-      tp_svc_channel_type_dbus_tube_return_from_accept (context,
>+      tp_svc_channel_type_dbus_tube1_return_from_accept (context,
>           tube->priv->dbus_srv_addr);
>       ;
>     }
>@@ -1742,10 +1742,10 @@ static void
> dbustube_iface_init (gpointer g_iface,
>                      gpointer iface_data)
> {
>-  TpSvcChannelTypeDBusTubeClass *klass =
>-      (TpSvcChannelTypeDBusTubeClass *) g_iface;
>+  TpSvcChannelTypeDBusTube1Class *klass =
>+      (TpSvcChannelTypeDBusTube1Class *) g_iface;
> 
>-#define IMPLEMENT(x, suffix) tp_svc_channel_type_dbus_tube_implement_##x (\
>+#define IMPLEMENT(x, suffix) tp_svc_channel_type_dbus_tube1_implement_##x (\
>     klass, gabble_tube_dbus_##x##suffix)
>   IMPLEMENT(offer,_async);
>   IMPLEMENT(accept,_async);
>diff --git a/src/tube-stream.c b/src/tube-stream.c
>index 51e1b01..9e9fdd5 100644
>--- a/src/tube-stream.c
>+++ b/src/tube-stream.c
>@@ -67,18 +67,18 @@ G_DEFINE_TYPE_WITH_CODE (GabbleTubeStream, gabble_tube_stream,
>     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
>       tp_dbus_properties_mixin_iface_init);
>     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_TUBE_IFACE, tube_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE1,
>       streamtube_iface_init);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE1,
>       NULL);
>-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
>+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
>       tp_external_group_mixin_iface_init);
> );
> 
> static const gchar * const gabble_tube_stream_channel_allowed_properties[] = {
>     TP_IFACE_CHANNEL ".TargetHandle",
>     TP_IFACE_CHANNEL ".TargetID",
>-    TP_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service",
>+    TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1 ".Service",
>     NULL
> };
> 
>@@ -178,7 +178,7 @@ gabble_tube_stream_get_interfaces (TpBaseChannel *base)
>   interfaces = TP_BASE_CHANNEL_CLASS (
>       gabble_tube_stream_parent_class)->get_interfaces (base);
> 
>-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE);
>+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_TUBE1);
> 
>   return interfaces;
> }
>@@ -252,7 +252,7 @@ fire_connection_closed (GabbleTubeStream *self,
>    * same connection. */
>   g_hash_table_remove (priv->transport_to_id, transport);
> 
>-  tp_svc_channel_type_stream_tube_emit_connection_closed (self,
>+  tp_svc_channel_type_stream_tube1_emit_connection_closed (self,
>       connection_id, error, debug_msg);
> }
> 
>@@ -554,7 +554,7 @@ fire_new_local_connection (GabbleTubeStream *self,
> 
>   connection_id = generate_connection_id (self, transport);
> 
>-  tp_svc_channel_type_stream_tube_emit_new_local_connection (self,
>+  tp_svc_channel_type_stream_tube1_emit_new_local_connection (self,
>       connection_id);
> }
> 
>@@ -877,7 +877,7 @@ fire_new_remote_connection (GabbleTubeStream *self,
>         transport));
>   g_assert (connection_id != 0);
> 
>-  tp_svc_channel_type_stream_tube_emit_new_remote_connection (self,
>+  tp_svc_channel_type_stream_tube1_emit_new_remote_connection (self,
>       contact, tp_handle_inspect (contact_repo, contact),
>       &access_control_param, connection_id);
> 
>@@ -1385,15 +1385,15 @@ gabble_tube_stream_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))
>     {
>       tp_dbus_properties_mixin_fill_properties_hash (
>           G_OBJECT (chan), properties,
>-          TP_IFACE_CHANNEL_INTERFACE_TUBE, "Parameters",
>+          TP_IFACE_CHANNEL_INTERFACE_TUBE1, "Parameters",
>           NULL);
>     }
> }
>@@ -1428,12 +1428,12 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
>       { NULL }
>   };
>   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
>-      { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
>+      { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         stream_tube_props,
>       },
>-      { TP_IFACE_CHANNEL_INTERFACE_TUBE,
>+      { TP_IFACE_CHANNEL_INTERFACE_TUBE1,
>         tp_dbus_properties_mixin_getter_gobject_properties,
>         NULL,
>         tube_iface_props,
>@@ -1450,7 +1450,7 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class)
>   object_class->dispose = gabble_tube_stream_dispose;
>   object_class->finalize = gabble_tube_stream_finalize;
> 
>-  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_STREAM_TUBE;
>+  base_class->channel_type = TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1;
>   base_class->get_interfaces = gabble_tube_stream_get_interfaces;
>   base_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
>   base_class->close = gabble_tube_stream_close;
>@@ -1680,7 +1680,7 @@ gabble_tube_stream_accept (GabbleTubeIface *tube,
> 
>   priv->state = TP_TUBE_CHANNEL_STATE_OPEN;
> 
>-  tp_svc_channel_interface_tube_emit_tube_channel_state_changed (self,
>+  tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (self,
>       TP_TUBE_CHANNEL_STATE_OPEN);
> 
>   g_signal_emit (G_OBJECT (self), signals[OPENED], 0);
>@@ -1805,7 +1805,7 @@ gabble_tube_stream_add_bytestream (GabbleTubeIface *tube,
>           DEBUG ("Received first connection. Tube is now open");
>           priv->state = TP_TUBE_CHANNEL_STATE_OPEN;
> 
>-          tp_svc_channel_interface_tube_emit_tube_channel_state_changed (
>+          tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (
>               self, TP_TUBE_CHANNEL_STATE_OPEN);
> 
>           g_signal_emit (G_OBJECT (self), signals[OPENED], 0);
>@@ -2228,7 +2228,7 @@ gabble_tube_stream_get_supported_socket_types (void)
>  * on Channel.Type.StreamTube
>  */
> static void
>-gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube *iface,
>+gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface,
>     guint address_type,
>     const GValue *address,
>     guint access_control,
>@@ -2281,16 +2281,16 @@ gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube *iface,
> 
>   if (cls->target_handle_type == TP_HANDLE_TYPE_CONTACT)
>     {
>-      tp_svc_channel_interface_tube_emit_tube_channel_state_changed (
>+      tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (
>           self, TP_TUBE_CHANNEL_STATE_REMOTE_PENDING);
>     }
>   else
>     {
>-      tp_svc_channel_interface_tube_emit_tube_channel_state_changed (
>+      tp_svc_channel_interface_tube1_emit_tube_channel_state_changed (
>           self, TP_TUBE_CHANNEL_STATE_OPEN);
>     }
> 
>-  tp_svc_channel_type_stream_tube_return_from_offer (context);
>+  tp_svc_channel_type_stream_tube1_return_from_offer (context);
> }
> 
> /**
>@@ -2300,7 +2300,7 @@ gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube *iface,
>  * on Channel.Type.StreamTube
>  */
> static void
>-gabble_tube_stream_accept_async (TpSvcChannelTypeStreamTube *iface,
>+gabble_tube_stream_accept_async (TpSvcChannelTypeStreamTube1 *iface,
>     guint address_type,
>     guint access_control,
>     const GValue *access_control_param,
>@@ -2330,7 +2330,7 @@ gabble_tube_stream_accept_async (TpSvcChannelTypeStreamTube *iface,
>     gabble_muc_channel_send_presence (self->muc, NULL);
> #endif
> 
>-  tp_svc_channel_type_stream_tube_return_from_accept (context,
>+  tp_svc_channel_type_stream_tube1_return_from_accept (context,
>       priv->address);
> }
> 
>@@ -2355,10 +2355,10 @@ static void
> streamtube_iface_init (gpointer g_iface,
>                        gpointer iface_data)
> {
>-  TpSvcChannelTypeStreamTubeClass *klass =
>-      (TpSvcChannelTypeStreamTubeClass *) g_iface;
>+  TpSvcChannelTypeStreamTube1Class *klass =
>+      (TpSvcChannelTypeStreamTube1Class *) g_iface;
> 
>-#define IMPLEMENT(x, suffix) tp_svc_channel_type_stream_tube_implement_##x (\
>+#define IMPLEMENT(x, suffix) tp_svc_channel_type_stream_tube1_implement_##x (\
>     klass, gabble_tube_stream_##x##suffix)
>   IMPLEMENT(offer,_async);
>   IMPLEMENT(accept,_async);
>diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
>index 4cab58a..6537303 100644
>--- a/src/write-mgr-file.c
>+++ b/src/write-mgr-file.c
>@@ -280,7 +280,7 @@ write_presence (GKeyFile *f,
>   gpointer k, v;
> 
>   statuses = tp_asv_get_boxed (props,
>-      TP_PROP_PROTOCOL_INTERFACE_PRESENCE_STATUSES,
>+      TP_PROP_PROTOCOL_INTERFACE_PRESENCE1_STATUSES,
>       TP_HASH_TYPE_STATUS_SPEC_MAP);
>   g_return_if_fail (statuses != NULL);
> 
>@@ -349,11 +349,11 @@ mgr_file_contents (const char *busname,
>       auth_types = tp_asv_get_strv (props,
>           TP_PROP_PROTOCOL_AUTHENTICATION_TYPES);
>       addr_vcard_fields = tp_asv_get_strv (props,
>-          TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_VCARD_FIELDS);
>+          TP_PROP_PROTOCOL_INTERFACE_ADDRESSING1_ADDRESSABLE_VCARD_FIELDS);
>       addr_uri_schemes = tp_asv_get_strv (props,
>-          TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_URI_SCHEMES);
>+          TP_PROP_PROTOCOL_INTERFACE_ADDRESSING1_ADDRESSABLE_URI_SCHEMES);
>       mime_types = tp_asv_get_strv (props,
>-          TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES);
>+          TP_PROP_PROTOCOL_INTERFACE_AVATARS1_SUPPORTED_AVATAR_MIME_TYPES);
> 
>       write_parameters (f, section_name, TP_BASE_PROTOCOL (protocol));
>       write_rccs (f, section_name, props);
>@@ -374,31 +374,31 @@ mgr_file_contents (const char *busname,
>           mime_types, g_strv_length ((gchar **) mime_types));
>       g_key_file_set_integer (f, section_name, "MinimumAvatarHeight",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_HEIGHT,
>               NULL));
>       g_key_file_set_integer (f, section_name, "RecommendedAvatarHeight",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_HEIGHT,
>               NULL));
>       g_key_file_set_integer (f, section_name, "MaximumAvatarHeight",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_HEIGHT,
>               NULL));
>       g_key_file_set_integer (f, section_name, "MinimumAvatarWidth",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MINIMUM_AVATAR_WIDTH,
>               NULL));
>       g_key_file_set_integer (f, section_name, "RecommendedAvatarWidth",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_RECOMMENDED_AVATAR_WIDTH,
>               NULL));
>       g_key_file_set_integer (f, section_name, "MaximumAvatarWidth",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_WIDTH,
>               NULL));
>       g_key_file_set_integer (f, section_name, "MaximumAvatarBytes",
>           tp_asv_get_uint32 (props,
>-              TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES,
>+              TP_PROP_PROTOCOL_INTERFACE_AVATARS1_MAXIMUM_AVATAR_BYTES,
>               NULL));
> 
>       write_presence (f, section_name, props);
>-- 
>1.8.3.1
>

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.