Adapt for use of ABI versions in generated code

8 files changed, 82 insertions, 82 deletions

diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index 7b78a60..ba74236 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -132,7 +132,7 @@ get_alias (HazeConnection *self,
 }
 
 static void
-haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing *self,
+haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *self,
                                  const GArray *contacts,
                                  DBusGMethodInvocation *context)
 {
@@ -160,7 +160,7 @@ haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing *self,
         aliases[i] = get_alias (conn, handle);
     }
 
-    tp_svc_connection_interface_aliasing_return_from_request_aliases (
+    tp_svc_connection_interface_aliasing1_return_from_request_aliases (
         context, aliases);
     g_free (aliases);
 }
@@ -189,7 +189,7 @@ set_alias_success_cb (PurpleAccount *account,
         GUINT_TO_POINTER (tp_base_connection_get_self_handle (base_conn)),
         (gchar *) new_alias);
 
-    tp_svc_connection_interface_aliasing_emit_aliases_changed (base_conn,
+    tp_svc_connection_interface_aliasing1_emit_aliases_changed (base_conn,
         aliases);
 
     g_hash_table_unref (aliases);
@@ -265,7 +265,7 @@ set_aliases_foreach (gpointer key,
 }
 
 static void
-haze_connection_set_aliases (TpSvcConnectionInterfaceAliasing *self,
+haze_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *self,
                              GHashTable *aliases,
                              DBusGMethodInvocation *context)
 {
@@ -294,7 +294,7 @@ haze_connection_set_aliases (TpSvcConnectionInterfaceAliasing *self,
     }
     else
     {
-        tp_svc_connection_interface_aliasing_return_from_set_aliases (context);
+        tp_svc_connection_interface_aliasing1_return_from_set_aliases (context);
     }
 
 }
@@ -303,10 +303,10 @@ void
 haze_connection_aliasing_iface_init (gpointer g_iface,
                                      gpointer iface_data)
 {
-    TpSvcConnectionInterfaceAliasingClass *klass =
-        (TpSvcConnectionInterfaceAliasingClass *) g_iface;
+    TpSvcConnectionInterfaceAliasing1Class *klass =
+        (TpSvcConnectionInterfaceAliasing1Class *) g_iface;
 
-#define IMPLEMENT(x) tp_svc_connection_interface_aliasing_implement_##x (\
+#define IMPLEMENT(x) tp_svc_connection_interface_aliasing1_implement_##x (\
     klass, haze_connection_##x)
     IMPLEMENT(request_aliases);
     IMPLEMENT(set_aliases);
@@ -338,7 +338,7 @@ blist_node_aliased_cb (PurpleBlistNode *node,
         GUINT_TO_POINTER (handle),
         (gchar *) purple_buddy_get_alias (buddy));
 
-    tp_svc_connection_interface_aliasing_emit_aliases_changed (base_conn,
+    tp_svc_connection_interface_aliasing1_emit_aliases_changed (base_conn,
         aliases);
 
     g_hash_table_unref (aliases);
@@ -370,7 +370,7 @@ fill_contact_attributes (GObject *object,
 
         /* this steals the GValue */
         tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
-            TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias", value);
+            TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias", value);
     }
 }
 
@@ -378,6 +378,6 @@ void
 haze_connection_aliasing_init (GObject *object)
 {
     tp_contacts_mixin_add_contact_attributes_iface (object,
-        TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+        TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
         fill_contact_attributes);
 }
diff --git a/src/connection-avatars.c b/src/connection-avatars.c
index 375bd2e..c20a2c4 100644
--- a/src/connection-avatars.c
+++ b/src/connection-avatars.c
@@ -283,7 +283,7 @@ get_handle_token (HazeConnection *conn,
 }
 
 static void
-haze_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars *self,
+haze_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars1 *self,
                                          const GArray *contacts,
                                          DBusGMethodInvocation *context)
 {
@@ -339,14 +339,14 @@ haze_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars *self,
             g_hash_table_insert (tokens, GUINT_TO_POINTER (handle), token);
     }
 
-    tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (
+    tp_svc_connection_interface_avatars1_return_from_get_known_avatar_tokens (
         context, tokens);
 
     g_hash_table_unref (tokens);
 }
 
 static void
-haze_connection_request_avatars (TpSvcConnectionInterfaceAvatars *self,
+haze_connection_request_avatars (TpSvcConnectionInterfaceAvatars1 *self,
                                  const GArray *contacts,
                                  DBusGMethodInvocation *context)
 {
@@ -363,18 +363,18 @@ haze_connection_request_avatars (TpSvcConnectionInterfaceAvatars *self,
         if (avatar != NULL)
         {
             gchar *token = get_token (avatar);
-            tp_svc_connection_interface_avatars_emit_avatar_retrieved (
+            tp_svc_connection_interface_avatars1_emit_avatar_retrieved (
                 conn, handle, token, avatar, "" /* unknown MIME type */);
             g_free (token);
             g_array_free (avatar, TRUE);
         }
     }
 
-    tp_svc_connection_interface_avatars_return_from_request_avatars (context);
+    tp_svc_connection_interface_avatars1_return_from_request_avatars (context);
 }
 
 static void
-haze_connection_clear_avatar (TpSvcConnectionInterfaceAvatars *self,
+haze_connection_clear_avatar (TpSvcConnectionInterfaceAvatars1 *self,
                               DBusGMethodInvocation *context)
 {
     HazeConnection *conn = HAZE_CONNECTION (self);
@@ -383,13 +383,13 @@ haze_connection_clear_avatar (TpSvcConnectionInterfaceAvatars *self,
 
     purple_buddy_icons_set_account_icon (account, NULL, 0);
 
-    tp_svc_connection_interface_avatars_return_from_clear_avatar (context);
-    tp_svc_connection_interface_avatars_emit_avatar_updated (conn,
+    tp_svc_connection_interface_avatars1_return_from_clear_avatar (context);
+    tp_svc_connection_interface_avatars1_emit_avatar_updated (conn,
         tp_base_connection_get_self_handle (base_conn), "");
 }
 
 static void
-haze_connection_set_avatar (TpSvcConnectionInterfaceAvatars *self,
+haze_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *self,
                             const GArray *avatar,
                             const gchar *mime_type,
                             DBusGMethodInvocation *context)
@@ -461,8 +461,8 @@ haze_connection_set_avatar (TpSvcConnectionInterfaceAvatars *self,
     token = get_token (avatar);
     DEBUG ("%s", token);
 
-    tp_svc_connection_interface_avatars_return_from_set_avatar (context, token);
-    tp_svc_connection_interface_avatars_emit_avatar_updated (conn,
+    tp_svc_connection_interface_avatars1_return_from_set_avatar (context, token);
+    tp_svc_connection_interface_avatars1_emit_avatar_updated (conn,
         tp_base_connection_get_self_handle (base_conn), token);
     g_free (token);
 }
@@ -471,10 +471,10 @@ void
 haze_connection_avatars_iface_init (gpointer g_iface,
                                     gpointer iface_data)
 {
-    TpSvcConnectionInterfaceAvatarsClass *klass =
-        (TpSvcConnectionInterfaceAvatarsClass *) g_iface;
+    TpSvcConnectionInterfaceAvatars1Class *klass =
+        (TpSvcConnectionInterfaceAvatars1Class *) g_iface;
 
-#define IMPLEMENT(x) tp_svc_connection_interface_avatars_implement_##x (\
+#define IMPLEMENT(x) tp_svc_connection_interface_avatars1_implement_##x (\
     klass, haze_connection_##x)
     IMPLEMENT(get_known_avatar_tokens);
     IMPLEMENT(request_avatars);
@@ -499,7 +499,7 @@ buddy_icon_changed_cb (PurpleBuddy *buddy,
 
     DEBUG ("%s '%s'", bname, token);
 
-    tp_svc_connection_interface_avatars_emit_avatar_updated (conn, contact,
+    tp_svc_connection_interface_avatars1_emit_avatar_updated (conn, contact,
         token);
     g_free (token);
 }
@@ -532,7 +532,7 @@ fill_contact_attributes (GObject *object,
 
         /* this steals the GValue */
         tp_contacts_mixin_set_contact_attribute (attributes_hash, handle,
-            TP_IFACE_CONNECTION_INTERFACE_AVATARS "/token", value);
+            TP_IFACE_CONNECTION_INTERFACE_AVATARS1 "/token", value);
     }
 }
 
@@ -540,6 +540,6 @@ void
 haze_connection_avatars_init (GObject *object)
 {
     tp_contacts_mixin_add_contact_attributes_iface (object,
-        TP_IFACE_CONNECTION_INTERFACE_AVATARS,
+        TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
         fill_contact_attributes);
 }
diff --git a/src/connection-capabilities.c b/src/connection-capabilities.c
index 5a05e29..281d669 100644
--- a/src/connection-capabilities.c
+++ b/src/connection-capabilities.c
@@ -31,7 +31,7 @@
 #include "debug.h"
 
 static void
-haze_connection_update_capabilities (TpSvcConnectionInterfaceContactCapabilities *iface,
+haze_connection_update_capabilities (TpSvcConnectionInterfaceContactCapabilities1 *iface,
                                      const GPtrArray *clients,
                                      DBusGMethodInvocation *context)
 {
@@ -40,7 +40,7 @@ haze_connection_update_capabilities (TpSvcConnectionInterfaceContactCapabilities
 
   TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
 
-  tp_svc_connection_interface_contact_capabilities_return_from_update_capabilities (
+  tp_svc_connection_interface_contact_capabilities1_return_from_update_capabilities (
       context);
 }
 
@@ -117,7 +117,7 @@ conn_capabilities_fill_contact_attributes_contact_caps (
 
           g_value_take_boxed (val, array);
           tp_contacts_mixin_set_contact_attribute (attributes_hash,
-              handle, TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES "/capabilities",
+              handle, TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1 "/capabilities",
               val);
         }
       else
@@ -129,10 +129,10 @@ void
 haze_connection_contact_capabilities_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, haze_connection_##x)
   IMPLEMENT(update_capabilities);
 #undef IMPLEMENT
@@ -142,6 +142,6 @@ void
 haze_connection_capabilities_init (GObject *object)
 {
   tp_contacts_mixin_add_contact_attributes_iface (object,
-      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
       conn_capabilities_fill_contact_attributes_contact_caps);
 }
diff --git a/src/connection-mail.c b/src/connection-mail.c
index 767ee2d..5fd9aa8 100644
--- a/src/connection-mail.c
+++ b/src/connection-mail.c
@@ -43,7 +43,7 @@ static GPtrArray empty_array = { 0 };
 
 static void
 haze_connection_mail_request_inbox_url (
-        TpSvcConnectionInterfaceMailNotification *iface,
+        TpSvcConnectionInterfaceMailNotification1 *iface,
         DBusGMethodInvocation *context)
 {
     GError e = {TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
@@ -54,7 +54,7 @@ haze_connection_mail_request_inbox_url (
 
 static void
 haze_connection_mail_request_mail_url (
-        TpSvcConnectionInterfaceMailNotification *iface,
+        TpSvcConnectionInterfaceMailNotification1 *iface,
         const gchar *in_id,
         const GValue *in_url_data,
         DBusGMethodInvocation *context)
@@ -75,7 +75,7 @@ haze_connection_mail_request_mail_url (
         TP_ARRAY_TYPE_HTTP_POST_DATA_LIST, &empty_array,
         G_TYPE_INVALID);
 
-    tp_svc_connection_interface_mail_notification_return_from_request_inbox_url (
+    tp_svc_connection_interface_mail_notification1_return_from_request_inbox_url (
         context, result);
 
     g_value_array_free (result);
@@ -93,9 +93,9 @@ void
 haze_connection_mail_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, haze_connection_mail_##x)
     IMPLEMENT(request_inbox_url);
     IMPLEMENT(request_mail_url);
@@ -222,8 +222,8 @@ haze_connection_mail_notify_emails (PurpleConnection *pc,
         const char **urls)
 {
     GPtrArray *mails;
-    TpSvcConnectionInterfaceMailNotification *conn =
-        TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION (
+    TpSvcConnectionInterfaceMailNotification1 *conn =
+        TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1 (
             ACCOUNT_GET_TP_BASE_CONNECTION (
                 purple_connection_get_account (pc)));
 
@@ -292,7 +292,7 @@ haze_connection_mail_notify_emails (PurpleConnection *pc,
                 }
         }
 
-    tp_svc_connection_interface_mail_notification_emit_mails_received (
+    tp_svc_connection_interface_mail_notification1_emit_mails_received (
             conn, mails);
     g_ptr_array_unref (mails);
 
diff --git a/src/connection.c b/src/connection.c
index 8489f87..8af1c47 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -64,47 +64,47 @@ G_DEFINE_TYPE_WITH_CODE(HazeConnection,
     TP_TYPE_BASE_CONNECTION,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
         tp_dbus_properties_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
         tp_presence_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1,
         haze_connection_aliasing_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS1,
         haze_connection_avatars_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
         haze_connection_contact_capabilities_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_MAIL_NOTIFICATION,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
         haze_connection_mail_iface_init);
     );
 
 static const gchar * implemented_interfaces[] = {
     /* Conditionally present */
 
-    TP_IFACE_CONNECTION_INTERFACE_AVATARS,
-    TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
+    TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
+    TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
 #   define HAZE_NUM_CONDITIONAL_INTERFACES 3
 
     /* Always present */
 
-    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_PRESENCE,
-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
+    TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1,
     TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
     /* TODO: This is a lie.  Not all protocols supported by libpurple
      *       actually have the concept of a user-settable alias, but
      *       there's no way for the UI to know (yet).
      */
-    TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+    TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
     NULL
 };
 
@@ -198,15 +198,15 @@ add_optional_connection_interfaces (GPtrArray *ifaces,
 {
     if (protocol_info_supports_avatar (prpl_info))
         g_ptr_array_add (ifaces,
-                TP_IFACE_CONNECTION_INTERFACE_AVATARS);
+                TP_IFACE_CONNECTION_INTERFACE_AVATARS1);
 
     if (protocol_info_supports_blocking (prpl_info))
         g_ptr_array_add (ifaces,
-                TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING);
+                TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1);
 
     if (protocol_info_supports_mail_notification (prpl_info))
         g_ptr_array_add (ifaces,
-                TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION);
+                TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1);
 }
 
 static void
@@ -833,15 +833,15 @@ haze_connection_class_init (HazeConnectionClass *klass)
         { NULL }
     };
     static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-        { TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+        { TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
             haze_connection_aliasing_properties_getter,
             NULL,
             NULL },     /* initialized a bit later */
-        { TP_IFACE_CONNECTION_INTERFACE_AVATARS,
+        { TP_IFACE_CONNECTION_INTERFACE_AVATARS1,
             haze_connection_avatars_properties_getter,
             NULL,
             NULL },     /* initialized a bit later */
-        { TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION,
+        { TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION1,
             haze_connection_mail_properties_getter,
             NULL,
             mail_props,
diff --git a/src/im-channel-factory.c b/src/im-channel-factory.c
index 3147d98..222cafa 100644
--- a/src/im-channel-factory.c
+++ b/src/im-channel-factory.c
@@ -102,8 +102,8 @@ conversation_updated_cb (PurpleConversation *conv,
     chan = get_im_channel (im_factory, ui_data->contact_handle,
         ui_data->contact_handle, NULL, NULL);
 
-    tp_svc_channel_interface_chat_state_emit_chat_state_changed (
-        (TpSvcChannelInterfaceChatState*)chan, ui_data->contact_handle, state);
+    tp_svc_channel_interface_chat_state1_emit_chat_state_changed (
+        (TpSvcChannelInterfaceChatState1 *)chan, ui_data->contact_handle, state);
 }
 
 static void
diff --git a/src/im-channel.c b/src/im-channel.c
index f4fa174..4ab9afe 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -40,12 +40,12 @@ static void chat_state_iface_init (gpointer g_iface, gpointer iface_data);
 G_DEFINE_TYPE_WITH_CODE(HazeIMChannel, haze_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_DESTROYABLE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1,
         destroyable_iface_init);
 
     /* For some reason we reimplement ChatState rather than having the
      * TpMessageMixin do it :-( */
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE1,
         chat_state_iface_init))
 
 static void
@@ -100,9 +100,9 @@ haze_im_channel_get_interfaces (TpBaseChannel *base)
       haze_im_channel_parent_class)->get_interfaces (base);
 
   if (_chat_state_available (self))
-    g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE);
+    g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1);
 
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1);
 
   return interfaces;
 }
@@ -114,7 +114,7 @@ haze_im_channel_get_interfaces (TpBaseChannel *base)
  * on interface im.telepathy1.Channel.Interface.Destroyable
  */
 static void
-haze_im_channel_destroy (TpSvcChannelInterfaceDestroyable *iface,
+haze_im_channel_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
                          DBusGMethodInvocation *context)
 {
     HazeIMChannel *self = HAZE_IM_CHANNEL (iface);
@@ -127,16 +127,16 @@ haze_im_channel_destroy (TpSvcChannelInterfaceDestroyable *iface,
     tp_message_mixin_clear ((GObject *) self);
 
     haze_im_channel_close (TP_BASE_CHANNEL (self));
-    tp_svc_channel_interface_destroyable_return_from_destroy (context);
+    tp_svc_channel_interface_destroyable1_return_from_destroy (context);
 }
 
 static void
 destroyable_iface_init (gpointer 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, haze_im_channel_##x)
     IMPLEMENT(destroy);
 #undef IMPLEMENT
@@ -172,7 +172,7 @@ resend_typing_cb (gpointer data)
 
 
 static void
-haze_im_channel_set_chat_state (TpSvcChannelInterfaceChatState *self,
+haze_im_channel_set_chat_state (TpSvcChannelInterfaceChatState1 *self,
                                 guint state,
                                 DBusGMethodInvocation *context)
 {
@@ -244,15 +244,15 @@ haze_im_channel_set_chat_state (TpSvcChannelInterfaceChatState *self,
             resend_typing_cb, conv);
     }
 
-    tp_svc_channel_interface_chat_state_return_from_set_chat_state (context);
+    tp_svc_channel_interface_chat_state1_return_from_set_chat_state (context);
 }
 
 static void
 chat_state_iface_init (gpointer g_iface, gpointer iface_data)
 {
-    TpSvcChannelInterfaceChatStateClass *klass =
-        (TpSvcChannelInterfaceChatStateClass *)g_iface;
-#define IMPLEMENT(x) tp_svc_channel_interface_chat_state_implement_##x (\
+    TpSvcChannelInterfaceChatState1Class *klass =
+        (TpSvcChannelInterfaceChatState1Class *)g_iface;
+#define IMPLEMENT(x) tp_svc_channel_interface_chat_state1_implement_##x (\
     klass, haze_im_channel_##x)
     IMPLEMENT(set_chat_state);
 #undef IMPLEMENT
diff --git a/src/protocol.c b/src/protocol.c
index a927708..c6c0c88 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -918,9 +918,9 @@ haze_protocol_get_interfaces_array (TpBaseProtocol *base)
   for (i = 0; i < tmp->len; i++)
     {
       if (!tp_strdiff (g_ptr_array_index (tmp, i),
-            TP_IFACE_CONNECTION_INTERFACE_AVATARS))
+            TP_IFACE_CONNECTION_INTERFACE_AVATARS1))
         {
-          g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS);
+          g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS1);
           break;
         }
     }
@@ -1006,7 +1006,7 @@ static GStrv
 haze_protocol_dup_authentication_types (TpBaseProtocol *base)
 {
   static const gchar *types[] = {
-    TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+    TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
     NULL
   };