From 44ac051119c677c295095c2b8496f49a96f95a63 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 28 Oct 2013 10:07:47 +0100 Subject: [PATCH 2/2] tests/lib: sync with tp-glib next --- tests/lib/contacts-conn.c | 116 ++++++++++++++++++++++----------------------- tests/lib/echo-chan.c | 12 ++--- tests/lib/room-list-chan.c | 22 ++++----- tests/lib/simple-account.c | 18 +++---- 4 files changed, 84 insertions(+), 84 deletions(-) diff --git a/tests/lib/contacts-conn.c b/tests/lib/contacts-conn.c index 6e7c39c..5ebc35f 100644 --- a/tests/lib/contacts-conn.c +++ b/tests/lib/contacts-conn.c @@ -29,24 +29,24 @@ static void conn_avatars_properties_getter (GObject *object, GQuark interface, G_DEFINE_TYPE_WITH_CODE (TpTestsContactsConnection, tp_tests_contacts_connection, TP_TESTS_TYPE_SIMPLE_CONNECTION, - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1, init_aliasing); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS1, init_avatars); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1, tp_presence_mixin_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION, NULL) + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION1, NULL) G_IMPLEMENT_INTERFACE ( - TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, NULL) - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO, + TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1, NULL) + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO1, init_contact_info) G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS, tp_contacts_mixin_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1, tp_base_contact_list_mixin_list_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1, tp_base_contact_list_mixin_groups_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES1, NULL); ); @@ -199,7 +199,7 @@ aliasing_fill_contact_attributes (GObject *object, } tp_contacts_mixin_set_contact_attribute (attributes, handle, - TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias", + TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias", tp_g_value_slice_new_string (alias)); } } @@ -221,7 +221,7 @@ avatars_fill_contact_attributes (GObject *object, if (a != NULL && a->token != NULL) { tp_contacts_mixin_set_contact_attribute (attributes, handle, - TP_IFACE_CONNECTION_INTERFACE_AVATARS "/token", + TP_IFACE_CONNECTION_INTERFACE_AVATARS1 "/token", tp_g_value_slice_new_string (a->token)); } } @@ -244,7 +244,7 @@ location_fill_contact_attributes (GObject *object, if (location != NULL) { tp_contacts_mixin_set_contact_attribute (attributes, handle, - TP_IFACE_CONNECTION_INTERFACE_LOCATION "/location", + TP_IFACE_CONNECTION_INTERFACE_LOCATION1 "/location", tp_g_value_slice_new_boxed (TP_HASH_TYPE_LOCATION, location)); } } @@ -267,7 +267,7 @@ contact_caps_fill_contact_attributes (GObject *object, if (caps != NULL) { tp_contacts_mixin_set_contact_attribute (attributes, handle, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES "/capabilities", + TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1 "/capabilities", tp_g_value_slice_new_boxed ( TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST, caps)); } @@ -291,7 +291,7 @@ contact_info_fill_contact_attributes (GObject *object, if (info != NULL) { tp_contacts_mixin_set_contact_attribute (attributes, handle, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO "/info", + TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1 "/info", tp_g_value_slice_new_boxed (TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, info)); } @@ -404,22 +404,22 @@ constructed (GObject *object) TP_BASE_CONTACT_LIST (self->priv->list_manager), base); } tp_contacts_mixin_add_contact_attributes_iface (object, - TP_IFACE_CONNECTION_INTERFACE_ALIASING, + TP_IFACE_CONNECTION_INTERFACE_ALIASING1, aliasing_fill_contact_attributes); tp_contacts_mixin_add_contact_attributes_iface (object, - TP_IFACE_CONNECTION_INTERFACE_AVATARS, + TP_IFACE_CONNECTION_INTERFACE_AVATARS1, avatars_fill_contact_attributes); tp_contacts_mixin_add_contact_attributes_iface (object, - TP_IFACE_CONNECTION_INTERFACE_LOCATION, + TP_IFACE_CONNECTION_INTERFACE_LOCATION1, location_fill_contact_attributes); tp_contacts_mixin_add_contact_attributes_iface (object, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1, contact_caps_fill_contact_attributes); tp_contacts_mixin_add_contact_attributes_iface (object, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1, contact_info_fill_contact_attributes); tp_contacts_mixin_add_contact_attributes_iface (object, - TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES, + TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1, client_types_fill_contact_attributes); tp_presence_mixin_init (object, @@ -532,16 +532,16 @@ tp_tests_contacts_get_interfaces_always_present (TpBaseConnection *base) { GPtrArray *interfaces; static const gchar *interfaces_always_present[] = { - TP_IFACE_CONNECTION_INTERFACE_ALIASING, - TP_IFACE_CONNECTION_INTERFACE_AVATARS, + TP_IFACE_CONNECTION_INTERFACE_ALIASING1, + TP_IFACE_CONNECTION_INTERFACE_AVATARS1, TP_IFACE_CONNECTION_INTERFACE_CONTACTS, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS, - TP_IFACE_CONNECTION_INTERFACE_PRESENCE, - TP_IFACE_CONNECTION_INTERFACE_LOCATION, - TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, - TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1, + TP_IFACE_CONNECTION_INTERFACE_PRESENCE1, + TP_IFACE_CONNECTION_INTERFACE_LOCATION1, + TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES1, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1, NULL }; guint i; @@ -589,17 +589,17 @@ tp_tests_contacts_connection_class_init (TpTestsContactsConnectionClass *klass) { NULL } }; static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = { - { TP_IFACE_CONNECTION_INTERFACE_AVATARS, + { TP_IFACE_CONNECTION_INTERFACE_AVATARS1, conn_avatars_properties_getter, NULL, conn_avatars_properties, }, - { TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO, + { TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO1, conn_contact_info_properties_getter, NULL, conn_contact_info_properties, }, - { TP_IFACE_CONNECTION_INTERFACE_ALIASING, + { TP_IFACE_CONNECTION_INTERFACE_ALIASING1, aliasing_get_dbus_property, NULL, aliasing_props, @@ -669,7 +669,7 @@ tp_tests_contacts_connection_change_aliases (TpTestsContactsConnection *self, GUINT_TO_POINTER (handles[i]), (gchar *) aliases[i]); } - tp_svc_connection_interface_aliasing_emit_aliases_changed (self, changes); + tp_svc_connection_interface_aliasing1_emit_aliases_changed (self, changes); g_hash_table_unref (changes); } @@ -729,7 +729,7 @@ tp_tests_contacts_connection_change_avatar_tokens (TpTestsContactsConnection *se DEBUG ("contact#%u -> %s", handles[i], tokens[i]); g_hash_table_insert (self->priv->avatars, GUINT_TO_POINTER (handles[i]), avatar_data_new (NULL, NULL, tokens[i])); - tp_svc_connection_interface_avatars_emit_avatar_updated (self, + tp_svc_connection_interface_avatars1_emit_avatar_updated (self, handles[i], tokens[i]); } } @@ -745,7 +745,7 @@ tp_tests_contacts_connection_change_avatar_data ( g_hash_table_insert (self->priv->avatars, GUINT_TO_POINTER (handle), avatar_data_new (data, mime_type, token)); - tp_svc_connection_interface_avatars_emit_avatar_updated (self, + tp_svc_connection_interface_avatars1_emit_avatar_updated (self, handle, token); } @@ -764,7 +764,7 @@ tp_tests_contacts_connection_change_locations (TpTestsContactsConnection *self, g_hash_table_insert (self->priv->locations, GUINT_TO_POINTER (handles[i]), g_hash_table_ref (locations[i])); - tp_svc_connection_interface_location_emit_location_updated (self, + tp_svc_connection_interface_location1_emit_location_updated (self, handles[i], locations[i]); } } @@ -786,7 +786,7 @@ tp_tests_contacts_connection_change_capabilities ( caps)); } - tp_svc_connection_interface_contact_capabilities_emit_contact_capabilities_changed ( + tp_svc_connection_interface_contact_capabilities1_emit_contact_capabilities_changed ( self, capabilities); } @@ -799,7 +799,7 @@ tp_tests_contacts_connection_change_contact_info ( g_hash_table_insert (self->priv->contact_info, GUINT_TO_POINTER (handle), g_ptr_array_ref (info)); - tp_svc_connection_interface_contact_info_emit_contact_info_changed (self, + tp_svc_connection_interface_contact_info1_emit_contact_info_changed (self, handle, info); } @@ -814,7 +814,7 @@ tp_tests_contacts_connection_set_default_contact_info ( } static void -my_request_aliases (TpSvcConnectionInterfaceAliasing *aliasing, +my_request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing, const GArray *contacts, DBusGMethodInvocation *context) { @@ -853,13 +853,13 @@ my_request_aliases (TpSvcConnectionInterfaceAliasing *aliasing, g_ptr_array_add (result, NULL); strings = (gchar **) g_ptr_array_free (result, FALSE); - tp_svc_connection_interface_aliasing_return_from_request_aliases (context, + tp_svc_connection_interface_aliasing1_return_from_request_aliases (context, (const gchar **) strings); g_free (strings); } static void -my_set_aliases (TpSvcConnectionInterfaceAliasing *aliasing, +my_set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing, GHashTable *table, DBusGMethodInvocation *context) { @@ -902,7 +902,7 @@ my_set_aliases (TpSvcConnectionInterfaceAliasing *aliasing, (const TpHandle *) handles->data, (const gchar * const *) aliases->pdata); - tp_svc_connection_interface_aliasing_return_from_set_aliases (context); + tp_svc_connection_interface_aliasing1_return_from_set_aliases (context); out: g_array_unref (handles); @@ -913,9 +913,9 @@ static void init_aliasing (gpointer g_iface, gpointer iface_data) { - TpSvcConnectionInterfaceAliasingClass *klass = g_iface; + TpSvcConnectionInterfaceAliasing1Class *klass = g_iface; -#define IMPLEMENT(x) tp_svc_connection_interface_aliasing_implement_##x (\ +#define IMPLEMENT(x) tp_svc_connection_interface_aliasing1_implement_##x (\ klass, my_##x) IMPLEMENT(request_aliases); IMPLEMENT(set_aliases); @@ -923,7 +923,7 @@ init_aliasing (gpointer g_iface, } static void -my_request_avatars (TpSvcConnectionInterfaceAvatars *avatars, +my_request_avatars (TpSvcConnectionInterfaceAvatars1 *avatars, const GArray *contacts, DBusGMethodInvocation *context) { @@ -950,11 +950,11 @@ my_request_avatars (TpSvcConnectionInterfaceAvatars *avatars, GUINT_TO_POINTER (handle)); if (a != NULL) - tp_svc_connection_interface_avatars_emit_avatar_retrieved (self, handle, + tp_svc_connection_interface_avatars1_emit_avatar_retrieved (self, handle, a->token, a->data, a->mime_type); } - tp_svc_connection_interface_avatars_return_from_request_avatars (context); + tp_svc_connection_interface_avatars1_return_from_request_avatars (context); } static void @@ -981,9 +981,9 @@ static void init_avatars (gpointer g_iface, gpointer iface_data) { - TpSvcConnectionInterfaceAvatarsClass *klass = g_iface; + TpSvcConnectionInterfaceAvatars1Class *klass = g_iface; -#define IMPLEMENT(x) tp_svc_connection_interface_avatars_implement_##x (\ +#define IMPLEMENT(x) tp_svc_connection_interface_avatars1_implement_##x (\ klass, my_##x) /* IMPLEMENT(get_avatar_requirements); */ /* IMPLEMENT(request_avatar); */ @@ -1014,7 +1014,7 @@ lookup_contact_info (TpTestsContactsConnection *self, } static void -my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *obj, +my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj, const GArray *contacts, DBusGMethodInvocation *context) { @@ -1039,17 +1039,17 @@ my_refresh_contact_info (TpSvcConnectionInterfaceContactInfo *obj, TpHandle handle = g_array_index (contacts, guint, i); GPtrArray *arr = lookup_contact_info (self, handle); - tp_svc_connection_interface_contact_info_emit_contact_info_changed (self, + tp_svc_connection_interface_contact_info1_emit_contact_info_changed (self, handle, arr); g_ptr_array_unref (arr); } - tp_svc_connection_interface_contact_info_return_from_refresh_contact_info ( + tp_svc_connection_interface_contact_info1_return_from_refresh_contact_info ( context); } static void -my_request_contact_info (TpSvcConnectionInterfaceContactInfo *obj, +my_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj, guint handle, DBusGMethodInvocation *context) { @@ -1071,14 +1071,14 @@ my_request_contact_info (TpSvcConnectionInterfaceContactInfo *obj, ret = lookup_contact_info (self, handle); - tp_svc_connection_interface_contact_info_return_from_request_contact_info ( + tp_svc_connection_interface_contact_info1_return_from_request_contact_info ( context, ret); g_ptr_array_unref (ret); } static void -my_set_contact_info (TpSvcConnectionInterfaceContactInfo *obj, +my_set_contact_info (TpSvcConnectionInterfaceContactInfo1 *obj, const GPtrArray *info, DBusGMethodInvocation *context) { @@ -1101,7 +1101,7 @@ my_set_contact_info (TpSvcConnectionInterfaceContactInfo *obj, tp_tests_contacts_connection_change_contact_info (self, self_handle, copy); g_ptr_array_unref (copy); - tp_svc_connection_interface_contact_info_return_from_set_contact_info ( + tp_svc_connection_interface_contact_info1_return_from_set_contact_info ( context); } @@ -1109,9 +1109,9 @@ static void init_contact_info (gpointer g_iface, gpointer iface_data) { - TpSvcConnectionInterfaceContactInfoClass *klass = g_iface; + TpSvcConnectionInterfaceContactInfo1Class *klass = g_iface; -#define IMPLEMENT(x) tp_svc_connection_interface_contact_info_implement_##x (\ +#define IMPLEMENT(x) tp_svc_connection_interface_contact_info1_implement_##x (\ klass, my_##x) IMPLEMENT (refresh_contact_info); IMPLEMENT (request_contact_info); diff --git a/tests/lib/echo-chan.c b/tests/lib/echo-chan.c index 868fbcf..9234a6a 100644 --- a/tests/lib/echo-chan.c +++ b/tests/lib/echo-chan.c @@ -25,7 +25,7 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsEchoChannel, TP_TYPE_BASE_CHANNEL, G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT, tp_message_mixin_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1, destroyable_iface_init); ) @@ -39,7 +39,7 @@ tp_tests_echo_channel_get_interfaces (TpBaseChannel *self) interfaces = TP_BASE_CHANNEL_CLASS (tp_tests_echo_channel_parent_class)-> get_interfaces (self); - g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE); + g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1); return interfaces; }; @@ -199,7 +199,7 @@ text_send (GObject *object, } static void -destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface, +destroyable_destroy (TpSvcChannelInterfaceDestroyable1 *iface, DBusGMethodInvocation *context) { TpTestsEchoChannel *self = TP_TESTS_ECHO_CHANNEL (iface); @@ -207,17 +207,17 @@ destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface, tp_message_mixin_clear ((GObject *) self); tp_base_channel_destroyed (TP_BASE_CHANNEL (self)); - tp_svc_channel_interface_destroyable_return_from_destroy (context); + tp_svc_channel_interface_destroyable1_return_from_destroy (context); } static void destroyable_iface_init (gpointer iface, gpointer data) { - TpSvcChannelInterfaceDestroyableClass *klass = iface; + TpSvcChannelInterfaceDestroyable1Class *klass = iface; #define IMPLEMENT(x) \ - tp_svc_channel_interface_destroyable_implement_##x (klass, destroyable_##x) + tp_svc_channel_interface_destroyable1_implement_##x (klass, destroyable_##x) IMPLEMENT (destroy); #undef IMPLEMENT } diff --git a/tests/lib/room-list-chan.c b/tests/lib/room-list-chan.c index a94133d..a3a7a8c 100644 --- a/tests/lib/room-list-chan.c +++ b/tests/lib/room-list-chan.c @@ -10,7 +10,7 @@ static void room_list_iface_init (gpointer iface, gpointer data); G_DEFINE_TYPE_WITH_CODE (TpTestsRoomListChan, tp_tests_room_list_chan, TP_TYPE_BASE_CHANNEL, - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST, room_list_iface_init)) + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST1, room_list_iface_init)) enum { PROP_SERVER = 1, @@ -106,7 +106,7 @@ fill_immutable_properties (TpBaseChannel *chan, tp_dbus_properties_mixin_fill_properties_hash ( G_OBJECT (chan), properties, - TP_IFACE_CHANNEL_TYPE_ROOM_LIST, "Server", + TP_IFACE_CHANNEL_TYPE_ROOM_LIST1, "Server", NULL); } @@ -133,7 +133,7 @@ tp_tests_room_list_chan_class_init ( oclass->constructed = tp_tests_room_list_chan_constructed; oclass->finalize = tp_tests_room_list_chan_finalize; - base_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST; + base_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST1; base_class->target_handle_type = TP_HANDLE_TYPE_NONE; base_class->fill_immutable_properties = fill_immutable_properties; base_class->close = room_list_chan_close; @@ -145,7 +145,7 @@ tp_tests_room_list_chan_class_init ( g_object_class_install_property (oclass, PROP_SERVER, spec); tp_dbus_properties_mixin_implement_interface (oclass, - TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST, + TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST1, tp_dbus_properties_mixin_getter_gobject_properties, NULL, room_list_props); @@ -196,19 +196,19 @@ find_rooms (gpointer data) /* Find 2 rooms */ add_room (rooms); add_room (rooms); - tp_svc_channel_type_room_list_emit_got_rooms (self, rooms); + tp_svc_channel_type_room_list1_emit_got_rooms (self, rooms); g_ptr_array_set_size (rooms, 0); /* Find 1 room */ add_room (rooms); - tp_svc_channel_type_room_list_emit_got_rooms (self, rooms); + tp_svc_channel_type_room_list1_emit_got_rooms (self, rooms); g_ptr_array_unref (rooms); return FALSE; } static void -room_list_list_rooms (TpSvcChannelTypeRoomList *chan, +room_list_list_rooms (TpSvcChannelTypeRoomList1 *chan, DBusGMethodInvocation *context) { TpTestsRoomListChan *self = TP_TESTS_ROOM_LIST_CHAN (chan); @@ -232,21 +232,21 @@ room_list_list_rooms (TpSvcChannelTypeRoomList *chan, } self->priv->listing = TRUE; - tp_svc_channel_type_room_list_emit_listing_rooms (self, TRUE); + tp_svc_channel_type_room_list1_emit_listing_rooms (self, TRUE); g_idle_add (find_rooms, self); - tp_svc_channel_type_room_list_return_from_list_rooms (context); + tp_svc_channel_type_room_list1_return_from_list_rooms (context); } static void room_list_iface_init (gpointer iface, gpointer data) { - TpSvcChannelTypeRoomListClass *klass = iface; + TpSvcChannelTypeRoomList1Class *klass = iface; #define IMPLEMENT(x) \ - tp_svc_channel_type_room_list_implement_##x (klass, room_list_##x) + tp_svc_channel_type_room_list1_implement_##x (klass, room_list_##x) IMPLEMENT(list_rooms); #undef IMPLEMENT } diff --git a/tests/lib/simple-account.c b/tests/lib/simple-account.c index 7b9261d..2c6131b 100644 --- a/tests/lib/simple-account.c +++ b/tests/lib/simple-account.c @@ -22,11 +22,11 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccount, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT, account_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR1, NULL); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_ADDRESSING1, NULL); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE1, NULL); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, tp_dbus_properties_mixin_iface_init) @@ -34,8 +34,8 @@ G_DEFINE_TYPE_WITH_CODE (TpTestsSimpleAccount, /* TP_IFACE_ACCOUNT is implied */ static const char *ACCOUNT_INTERFACES[] = { - TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING, - TP_IFACE_ACCOUNT_INTERFACE_STORAGE, + TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1, + TP_IFACE_ACCOUNT_INTERFACE_STORAGE1, NULL }; enum @@ -372,18 +372,18 @@ tp_tests_simple_account_class_init (TpTestsSimpleAccountClass *klass) a_props }, { - TP_IFACE_ACCOUNT_INTERFACE_STORAGE, + TP_IFACE_ACCOUNT_INTERFACE_STORAGE1, tp_dbus_properties_mixin_getter_gobject_properties, NULL, ais_props }, { - TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING, + TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1, tp_dbus_properties_mixin_getter_gobject_properties, NULL, aia_props }, - { TP_IFACE_ACCOUNT_INTERFACE_AVATAR, + { TP_IFACE_ACCOUNT_INTERFACE_AVATAR1, tp_dbus_properties_mixin_getter_gobject_properties, NULL, avatar_props @@ -634,7 +634,7 @@ tp_tests_simple_account_add_uri_scheme (TpTestsSimpleAccount *self, NULL); tp_svc_dbus_properties_emit_properties_changed (self, - TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING, changed, NULL); + TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1, changed, NULL); g_strfreev (schemes); g_hash_table_unref (changed); -- 1.8.3.1