Adapt for use of ABI versions in generated code

9 files changed, 87 insertions, 88 deletions

diff --git a/src/idle-connection.c b/src/idle-connection.c
index 0d01611..80dcbb2 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -62,8 +62,8 @@ static void _aliasing_iface_init(gpointer, gpointer);
 static void _renaming_iface_init(gpointer, gpointer);
 
 G_DEFINE_TYPE_WITH_CODE(IdleConnection, idle_connection, TP_TYPE_BASE_CONNECTION,
-		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING, _aliasing_iface_init);
-		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO, idle_contact_info_iface_init);
+		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1, _aliasing_iface_init);
+		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO1, idle_contact_info_iface_init);
 		G_IMPLEMENT_INTERFACE(IDLE_TYPE_SVC_CONNECTION_INTERFACE_RENAMING, _renaming_iface_init);
 		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS, tp_contacts_mixin_iface_init);
 );
@@ -258,7 +258,7 @@ idle_connection_constructed (GObject *object)
   self->parser = g_object_new (IDLE_TYPE_PARSER, "connection", self, NULL);
   idle_contact_info_init (self);
   tp_contacts_mixin_add_contact_attributes_iface (object,
-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
       conn_aliasing_fill_contact_attributes);
 }
 
@@ -442,8 +442,8 @@ static void idle_connection_finalize (GObject *object) {
 }
 
 static const gchar * interfaces_always_present[] = {
-	TP_IFACE_CONNECTION_INTERFACE_ALIASING,
-	TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
+	TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
+	TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
 	IDLE_IFACE_CONNECTION_INTERFACE_RENAMING,
 	TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
 	TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
@@ -1293,7 +1293,7 @@ void idle_connection_emit_queued_aliases_changed(IdleConnection *conn) {
 	if (!priv->queued_aliases)
 		return;
 
-	tp_svc_connection_interface_aliasing_emit_aliases_changed(conn, priv->queued_aliases);
+	tp_svc_connection_interface_aliasing1_emit_aliases_changed(conn, priv->queued_aliases);
 
 	g_hash_table_unref (priv->queued_aliases);
 	priv->queued_aliases = NULL;
@@ -1335,12 +1335,12 @@ conn_aliasing_fill_contact_attributes (
       g_assert (alias != NULL);
 
       tp_contacts_mixin_set_contact_attribute (attributes_hash,
-          handle, TP_IFACE_CONNECTION_INTERFACE_ALIASING"/alias",
+          handle, TP_IFACE_CONNECTION_INTERFACE_ALIASING1"/alias",
           tp_g_value_slice_new_string (alias));
     }
 }
 
-static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing *iface, const GArray *handles, DBusGMethodInvocation *context) {
+static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing1 *iface, const GArray *handles, DBusGMethodInvocation *context) {
 	IdleConnection *self = IDLE_CONNECTION (iface);
 	TpHandleRepoIface *repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(iface), TP_HANDLE_TYPE_CONTACT);
 	GError *error = NULL;
@@ -1359,7 +1359,7 @@ static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing *if
 		aliases[i] = gimme_an_alias (self, repo, handle);
 	}
 
-	tp_svc_connection_interface_aliasing_return_from_request_aliases(context, aliases);
+	tp_svc_connection_interface_aliasing1_return_from_request_aliases(context, aliases);
 	g_free(aliases);
 }
 
@@ -1390,7 +1390,7 @@ static void idle_connection_request_rename(IdleSvcConnectionInterfaceRenaming *i
 		idle_svc_connection_interface_renaming_return_from_request_rename(context);
 }
 
-static void idle_connection_set_aliases(TpSvcConnectionInterfaceAliasing *iface, GHashTable *aliases, DBusGMethodInvocation *context) {
+static void idle_connection_set_aliases(TpSvcConnectionInterfaceAliasing1 *iface, GHashTable *aliases, DBusGMethodInvocation *context) {
 	IdleConnection *conn = IDLE_CONNECTION(iface);
 	const gchar *requested_alias = g_hash_table_lookup(aliases, GUINT_TO_POINTER(tp_base_connection_get_self_handle (TP_BASE_CONNECTION (conn))));
 
@@ -1402,7 +1402,7 @@ static void idle_connection_set_aliases(TpSvcConnectionInterfaceAliasing *iface,
 	}
 
 	if (_send_rename_request(conn, requested_alias, context))
-		tp_svc_connection_interface_aliasing_return_from_set_aliases(context);
+		tp_svc_connection_interface_aliasing1_return_from_set_aliases(context);
 }
 
 static gboolean idle_connection_hton(IdleConnection *obj, const gchar *input, gchar **output, GError **_error) {
@@ -1501,9 +1501,9 @@ idle_connection_ntoh(IdleConnection *obj, const gchar *input) {
 }
 
 static void _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, idle_connection_##x)
 	IMPLEMENT(request_aliases);
 	IMPLEMENT(set_aliases);
diff --git a/src/idle-contact-info.c b/src/idle-contact-info.c
index 07cd9a9..6634dd5 100644
--- a/src/idle-contact-info.c
+++ b/src/idle-contact-info.c
@@ -118,12 +118,12 @@ static void _queue_request_contact_info(IdleConnection *conn, guint handle, cons
 static void _return_from_request_contact_info(IdleConnection *conn) {
 	ContactInfoRequest *request = g_queue_peek_head(conn->contact_info_requests);
 
-	tp_svc_connection_interface_contact_info_return_from_request_contact_info(request->context, request->contact_info);
-	tp_svc_connection_interface_contact_info_emit_contact_info_changed(conn, request->handle, request->contact_info);
+	tp_svc_connection_interface_contact_info1_return_from_request_contact_info(request->context, request->contact_info);
+	tp_svc_connection_interface_contact_info1_emit_contact_info_changed(conn, request->handle, request->contact_info);
 	_dequeue_request_contact_info(conn);
 }
 
-static void idle_connection_request_contact_info(TpSvcConnectionInterfaceContactInfo *iface, guint contact, DBusGMethodInvocation *context) {
+static void idle_connection_request_contact_info(TpSvcConnectionInterfaceContactInfo1 *iface, guint contact, DBusGMethodInvocation *context) {
 	IdleConnection *self = IDLE_CONNECTION(iface);
 	TpBaseConnection *base = TP_BASE_CONNECTION(self);
 	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(base, TP_HANDLE_TYPE_CONTACT);
@@ -487,7 +487,7 @@ void idle_contact_info_class_init (IdleConnectionClass *klass) {
 	};
 
 	tp_dbus_properties_mixin_implement_interface(object_class,
-		TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO,
+		TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO1,
 		idle_contact_info_properties_getter,
 		NULL,
 		props);
@@ -528,14 +528,14 @@ void idle_contact_info_init (IdleConnection *conn) {
 	idle_parser_add_handler(conn->parser, IDLE_PARSER_NUMERIC_TRYAGAIN, _try_again_handler, conn);
 
 	tp_contacts_mixin_add_contact_attributes_iface ((GObject *) conn,
-		TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
+		TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1,
 		idle_contact_info_fill_contact_attributes);
 }
 
 void idle_contact_info_iface_init(gpointer g_iface, gpointer iface_data) {
-	TpSvcConnectionInterfaceContactInfoClass *klass = (TpSvcConnectionInterfaceContactInfoClass *) g_iface;
+	TpSvcConnectionInterfaceContactInfo1Class *klass = (TpSvcConnectionInterfaceContactInfo1Class *) 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, idle_connection_##x)
 	IMPLEMENT(request_contact_info);
 #undef IMPLEMENT
diff --git a/src/idle-im-channel.c b/src/idle-im-channel.c
index 4ac95aa..3e48944 100644
--- a/src/idle-im-channel.c
+++ b/src/idle-im-channel.c
@@ -39,7 +39,7 @@ static void idle_im_channel_finalize (GObject *object);
 
 G_DEFINE_TYPE_WITH_CODE(IdleIMChannel, idle_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, _destroyable_iface_init);
+    G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1, _destroyable_iface_init);
     )
 
 /* private structure */
@@ -173,7 +173,7 @@ idle_im_channel_get_interfaces (TpBaseChannel *channel)
       TP_BASE_CHANNEL_CLASS (idle_im_channel_parent_class)->get_interfaces (
           channel);
 
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1);
 
   return interfaces;
 }
@@ -202,7 +202,7 @@ idle_im_channel_send (
 
 static void
 idle_im_channel_destroy (
-    TpSvcChannelInterfaceDestroyable *iface,
+    TpSvcChannelInterfaceDestroyable1 *iface,
     DBusGMethodInvocation *context)
 {
   TpBaseChannel *chan = TP_BASE_CHANNEL (iface);
@@ -214,7 +214,7 @@ idle_im_channel_destroy (
   tp_message_mixin_clear (obj);
   tp_base_channel_destroyed (chan);
 
-  tp_svc_channel_interface_destroyable_return_from_destroy(context);
+  tp_svc_channel_interface_destroyable1_return_from_destroy(context);
 }
 
 static void
@@ -222,7 +222,7 @@ _destroyable_iface_init (
     gpointer klass,
     gpointer iface_data)
 {
-#define IMPLEMENT(x) tp_svc_channel_interface_destroyable_implement_##x (\
+#define IMPLEMENT(x) tp_svc_channel_interface_destroyable1_implement_##x (\
     klass, idle_im_channel_##x)
   IMPLEMENT (destroy);
 #undef IMPLEMENT
diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c
index db9ebe9..f67eedd 100644
--- a/src/idle-muc-channel.c
+++ b/src/idle-muc-channel.c
@@ -46,14 +46,14 @@ static void idle_muc_channel_send (GObject *obj, TpMessage *message, TpMessageSe
 static void idle_muc_channel_close (TpBaseChannel *base);
 
 G_DEFINE_TYPE_WITH_CODE(IdleMUCChannel, idle_muc_channel, TP_TYPE_BASE_CHANNEL,
-		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP, tp_group_mixin_iface_init);
-		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD, _password_iface_init);
+		G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1, tp_group_mixin_iface_init);
+		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_ROOM, NULL);
-		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SUBJECT, subject_iface_init);
-		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG,
+		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM1, NULL);
+		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SUBJECT1, subject_iface_init);
+		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG1,
                                        tp_base_room_config_iface_init);
-		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE, destroyable_iface_init);
+		G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1, destroyable_iface_init);
 		)
 
 /* property enum */
@@ -120,12 +120,12 @@ typedef struct {
 } IRCChannelModeState;
 
 static const gchar *muc_channel_interfaces[] = {
-	TP_IFACE_CHANNEL_INTERFACE_PASSWORD,
-	TP_IFACE_CHANNEL_INTERFACE_GROUP,
-	TP_IFACE_CHANNEL_INTERFACE_ROOM,
-	TP_IFACE_CHANNEL_INTERFACE_SUBJECT,
-	TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG,
-	TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE,
+	TP_IFACE_CHANNEL_INTERFACE_PASSWORD1,
+	TP_IFACE_CHANNEL_INTERFACE_GROUP1,
+	TP_IFACE_CHANNEL_INTERFACE_ROOM1,
+	TP_IFACE_CHANNEL_INTERFACE_SUBJECT1,
+	TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1,
+	TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1,
 	NULL
 };
 
@@ -325,8 +325,8 @@ idle_muc_channel_fill_immutable_properties (
       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);
 }
 
@@ -427,11 +427,11 @@ static void idle_muc_channel_class_init (IdleMUCChannelClass *idle_muc_channel_c
         tp_base_room_config_register_class (base_channel_class);
 
 	tp_dbus_properties_mixin_implement_interface (object_class,
-		TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM,
+		TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM1,
 		tp_dbus_properties_mixin_getter_gobject_properties, NULL,
 		room_props);
 	tp_dbus_properties_mixin_implement_interface (object_class,
-		TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT,
+		TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT1,
 		tp_dbus_properties_mixin_getter_gobject_properties, NULL,
 		subject_props);
 }
@@ -493,7 +493,7 @@ static void provide_password_reply(IdleMUCChannel *chan, gboolean success) {
 	priv = chan->priv;
 
 	if (priv->passwd_ctx != NULL) {
-		tp_svc_channel_interface_password_return_from_provide_password(priv->passwd_ctx, success);
+		tp_svc_channel_interface_password1_return_from_provide_password(priv->passwd_ctx, success);
 		priv->passwd_ctx = NULL;
 	} else {
 		IDLE_DEBUG("don't have a ProvidePassword context to return with! (%s, aka %u)",
@@ -565,7 +565,7 @@ idle_muc_channel_update_can_set_topic (
 
   priv->can_set_topic = !!can_set_topic;
   tp_dbus_properties_mixin_emit_properties_changed (G_OBJECT (self),
-      TP_IFACE_CHANNEL_INTERFACE_SUBJECT, changed);
+      TP_IFACE_CHANNEL_INTERFACE_SUBJECT1, changed);
 }
 
 static void change_mode_state(IdleMUCChannel *obj, guint add, guint remove) {
@@ -718,7 +718,7 @@ static void change_password_flags(IdleMUCChannel *obj, guint flag, gboolean stat
 
 	if (add | remove) {
 		IDLE_DEBUG("emitting PASSWORD_FLAGS_CHANGED with %u %u", add, remove);
-		tp_svc_channel_interface_password_emit_password_flags_changed((TpSvcChannelInterfacePassword *)(obj), add, remove);
+		tp_svc_channel_interface_password1_emit_password_flags_changed((TpSvcChannelInterfacePassword1 *)(obj), add, remove);
 	}
 }
 
@@ -1112,7 +1112,7 @@ idle_muc_channel_topic_full (
     priv->mode_state.topic_toucher_id = "";
 
   tp_dbus_properties_mixin_emit_properties_changed (G_OBJECT (self),
-      TP_IFACE_CHANNEL_INTERFACE_SUBJECT, changed);
+      TP_IFACE_CHANNEL_INTERFACE_SUBJECT1, changed);
 }
 
 void
@@ -1373,7 +1373,7 @@ idle_muc_channel_close (
 
 static void
 idle_muc_channel_destroy (
-    TpSvcChannelInterfaceDestroyable *object,
+    TpSvcChannelInterfaceDestroyable1 *object,
     DBusGMethodInvocation *context)
 {
 	TpBaseChannel *base = TP_BASE_CHANNEL (object);
@@ -1389,11 +1389,11 @@ idle_muc_channel_destroy (
 	if (priv->state < MUC_STATE_JOINED)
 		tp_base_channel_destroyed (base);
 
-	tp_svc_channel_interface_destroyable_return_from_destroy (context);
+	tp_svc_channel_interface_destroyable1_return_from_destroy (context);
 }
 
 
-static void idle_muc_channel_get_password_flags (TpSvcChannelInterfacePassword *iface, DBusGMethodInvocation *context) {
+static void idle_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 *iface, DBusGMethodInvocation *context) {
 	IdleMUCChannel *obj = IDLE_MUC_CHANNEL(iface);
 	IdleMUCChannelPrivate *priv;
 
@@ -1402,11 +1402,11 @@ static void idle_muc_channel_get_password_flags (TpSvcChannelInterfacePassword *
 
 	priv = obj->priv;
 
-	tp_svc_channel_interface_password_return_from_get_password_flags(context, priv->password_flags);
+	tp_svc_channel_interface_password1_return_from_get_password_flags(context, priv->password_flags);
 }
 
 
-static void idle_muc_channel_provide_password (TpSvcChannelInterfacePassword *iface, const gchar * password, DBusGMethodInvocation *context) {
+static void idle_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *iface, const gchar * password, DBusGMethodInvocation *context) {
 	IdleMUCChannel *obj = IDLE_MUC_CHANNEL(iface);
 	IdleMUCChannelPrivate *priv;
 
@@ -1458,7 +1458,7 @@ idle_muc_channel_send (GObject *obj, TpMessage *message, TpMessageSendingFlags f
 
 static void
 idle_muc_channel_set_subject (
-    TpSvcChannelInterfaceSubject *iface,
+    TpSvcChannelInterfaceSubject1 *iface,
     const gchar *subject,
     DBusGMethodInvocation *context)
 {
@@ -1487,7 +1487,7 @@ idle_muc_channel_set_subject (
           subject);
       send_command (self, cmd);
       /* FIXME: don't return till we get a reply */
-      tp_svc_channel_interface_subject_return_from_set_subject (context);
+      tp_svc_channel_interface_subject1_return_from_set_subject (context);
     }
 }
 
@@ -1538,9 +1538,9 @@ gboolean idle_muc_channel_is_typechar(gchar c)
 }
 
 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, idle_muc_channel_##x)
 	IMPLEMENT(get_password_flags);
 	IMPLEMENT(provide_password);
@@ -1552,10 +1552,10 @@ subject_iface_init (
     gpointer g_iface,
     gpointer iface_data G_GNUC_UNUSED)
 {
-  TpSvcChannelInterfaceSubjectClass *klass = g_iface;
+  TpSvcChannelInterfaceSubject1Class *klass = g_iface;
 
 #define IMPLEMENT(x) \
-  tp_svc_channel_interface_subject_implement_##x (klass, idle_muc_channel_##x)
+  tp_svc_channel_interface_subject1_implement_##x (klass, idle_muc_channel_##x)
   IMPLEMENT (set_subject);
 #undef IMPLEMENT
 }
@@ -1565,10 +1565,10 @@ destroyable_iface_init (
     gpointer g_iface,
     gpointer iface_data G_GNUC_UNUSED)
 {
-  TpSvcChannelInterfaceDestroyableClass *klass = g_iface;
+  TpSvcChannelInterfaceDestroyable1Class *klass = g_iface;
 
 #define IMPLEMENT(x) \
-  tp_svc_channel_interface_destroyable_implement_##x (klass, idle_muc_channel_##x)
+  tp_svc_channel_interface_destroyable1_implement_##x (klass, idle_muc_channel_##x)
   IMPLEMENT (destroy);
 #undef IMPLEMENT
 }
diff --git a/src/idle-muc-manager.c b/src/idle-muc-manager.c
index 28e4fc3..eefcf33 100644
--- a/src/idle-muc-manager.c
+++ b/src/idle-muc-manager.c
@@ -102,14 +102,14 @@ static const gchar * const muc_channel_allowed_properties[] = {
 
 static const gchar * const muc_channel_allowed_room_properties[] = {
     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, /* But it must be None */
-    TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME,
+    TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME,
     NULL
 };
 
 static const gchar * const muc_channel_all_allowed_properties[] = {
     TP_PROP_CHANNEL_TARGET_HANDLE,
     TP_PROP_CHANNEL_TARGET_ID,
-    TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME,
+    TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME,
 };
 
 static GObject*
@@ -791,7 +791,7 @@ _muc_manager_request (
       case TP_HANDLE_TYPE_NONE:
       {
         const gchar *room_name = tp_asv_get_string (request_properties,
-            TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME);
+            TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME);
 
         if (room_name == NULL)
           return FALSE;
diff --git a/src/idle-roomlist-channel.c b/src/idle-roomlist-channel.c
index cab6367..eb6bc4d 100644
--- a/src/idle-roomlist-channel.c
+++ b/src/idle-roomlist-channel.c
@@ -41,7 +41,7 @@ static IdleParserHandlerResult _rpl_listend_handler (IdleParser *parser, IdlePar
 
 G_DEFINE_TYPE_WITH_CODE (IdleRoomlistChannel, idle_roomlist_channel,
     TP_TYPE_BASE_CHANNEL,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST, _roomlist_iface_init);
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST1, _roomlist_iface_init);
     )
 
 /* private structure */
@@ -109,7 +109,7 @@ idle_roomlist_channel_get_roomlist_property (
     GValue *value,
     gpointer getter_data)
 {
-  g_return_if_fail (iface == TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST);
+  g_return_if_fail (iface == TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST1);
   g_return_if_fail (name == g_quark_from_static_string ("Server"));
   g_return_if_fail (G_VALUE_HOLDS_STRING (value));
 
@@ -127,7 +127,7 @@ idle_roomlist_channel_fill_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);
 }
 
@@ -148,14 +148,14 @@ idle_roomlist_channel_class_init (IdleRoomlistChannelClass *idle_roomlist_channe
   object_class->dispose = idle_roomlist_channel_dispose;
   object_class->finalize = idle_roomlist_channel_finalize;
 
-  base_channel_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST;
+  base_channel_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST1;
   base_channel_class->target_handle_type = TP_HANDLE_TYPE_NONE;
   base_channel_class->close = idle_roomlist_channel_close;
   base_channel_class->fill_immutable_properties = idle_roomlist_channel_fill_properties;
   base_channel_class->get_object_path_suffix = idle_roomlist_channel_get_path_suffix;
 
   tp_dbus_properties_mixin_implement_interface (object_class,
-      TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST,
+      TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST1,
       idle_roomlist_channel_get_roomlist_property,
       NULL,
       roomlist_props);
@@ -225,13 +225,13 @@ idle_roomlist_channel_close (TpBaseChannel *channel)
  * on interface im.telepathy1.Channel.Type.RoomList
  */
 static void
-idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList *iface,
+idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface,
                                          DBusGMethodInvocation *context)
 {
   IdleRoomlistChannel *self = IDLE_ROOMLIST_CHANNEL (iface);
   IdleRoomlistChannelPrivate *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);
 }
 
@@ -243,18 +243,18 @@ idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList *iface,
  * on interface im.telepathy1.Channel.Type.RoomList
  */
 static void
-idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList *iface,
+idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface,
                                   DBusGMethodInvocation *context)
 {
   IdleRoomlistChannel *self = IDLE_ROOMLIST_CHANNEL (iface);
   IdleRoomlistChannelPrivate *priv = self->priv;
 
   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);
 
   idle_connection_send(priv->connection, "LIST");
 
-  tp_svc_channel_type_room_list_return_from_list_rooms (context);
+  tp_svc_channel_type_room_list1_return_from_list_rooms (context);
 }
 
 /**
@@ -264,7 +264,7 @@ idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList *iface,
  * on interface im.telepathy1.Channel.Type.RoomList
  */
 static void
-idle_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList *iface,
+idle_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface,
                                     DBusGMethodInvocation *context)
 {
   IdleRoomlistChannel *self = IDLE_ROOMLIST_CHANNEL (iface);
@@ -289,10 +289,9 @@ static void
 _roomlist_iface_init (gpointer g_iface,
                   gpointer iface_data)
 {
-  TpSvcChannelTypeRoomListClass *klass =
-    (TpSvcChannelTypeRoomListClass *)(g_iface);
+  TpSvcChannelTypeRoomList1Class *klass = 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, idle_roomlist_channel_##x)
   IMPLEMENT (get_listing_rooms);
   IMPLEMENT (list_rooms);
@@ -363,8 +362,8 @@ emit_room_signal (IdleRoomlistChannel *self)
   if (priv->rooms->len == 0)
       return TRUE;
 
-  tp_svc_channel_type_room_list_emit_got_rooms (
-      (TpSvcChannelTypeRoomList *) self, priv->rooms);
+  tp_svc_channel_type_room_list1_emit_got_rooms (
+      (TpSvcChannelTypeRoomList1 *) self, priv->rooms);
 
   while (priv->rooms->len != 0)
     {
@@ -387,8 +386,8 @@ _rpl_listend_handler (IdleParser *parser,
   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);
 
   /*
   g_source_remove (priv->timer_source_id);
diff --git a/src/idle-roomlist-manager.c b/src/idle-roomlist-manager.c
index 970529b..4cfeccd 100644
--- a/src/idle-roomlist-manager.c
+++ b/src/idle-roomlist-manager.c
@@ -241,7 +241,7 @@ _roomlist_manager_foreach_class (TpChannelManager *self,
 {
   GHashTable *table = tp_asv_new (
       roomlist_channel_fixed_properties[0], G_TYPE_STRING,
-          TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
+          TP_IFACE_CHANNEL_TYPE_ROOM_LIST1,
       roomlist_channel_fixed_properties[1], G_TYPE_UINT,
           TP_HANDLE_TYPE_NONE,
       NULL);
@@ -300,7 +300,7 @@ _roomlist_manager_requestotron (IdleRoomlistManager *self,
   IDLE_DEBUG("requesting new room list channel");
 
   if (tp_strdiff (tp_asv_get_string (request_properties,
-          TP_IFACE_CHANNEL ".ChannelType"), TP_IFACE_CHANNEL_TYPE_ROOM_LIST))
+          TP_IFACE_CHANNEL ".ChannelType"), TP_IFACE_CHANNEL_TYPE_ROOM_LIST1))
     return FALSE;
 
   if (tp_asv_get_uint32 (request_properties,
diff --git a/src/protocol.c b/src/protocol.c
index 8e5a2cc..a4b5c7d 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -234,7 +234,7 @@ static GStrv
 dup_authentication_types (TpBaseProtocol *base)
 {
   const gchar * const types[] = {
-    TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+    TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
     NULL,
   };
 
diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
index aa2ef62..9d710b1 100644
--- a/src/server-tls-channel.c
+++ b/src/server-tls-channel.c
@@ -32,7 +32,7 @@
 
 G_DEFINE_TYPE_WITH_CODE (IdleServerTLSChannel, idle_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 idle_server_tls_channel_close (TpBaseChannel *base);
@@ -210,9 +210,9 @@ idle_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);
 }
 
@@ -253,7 +253,7 @@ idle_server_tls_channel_class_init (IdleServerTLSChannelClass *klass)
   oclass->finalize = idle_server_tls_channel_finalize;
   oclass->constructed = idle_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 =
       idle_server_tls_channel_fill_immutable_properties;
@@ -287,7 +287,7 @@ idle_server_tls_channel_class_init (IdleServerTLSChannelClass *klass)
   g_object_class_install_property (oclass, PROP_CERTIFICATE, 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);
 }