From b983d47fd5ab1cf2656c9d05739d8546ab0dd271 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 25 Oct 2013 17:18:10 +0200 Subject: [PATCH] Adapt for use of ABI versions in generated code --- rakia/call-content.c | 2 +- rakia/connection-aliasing.c | 22 +++++++++++----------- rakia/media-manager.c | 36 ++++++++++++++++++------------------ rakia/text-channel.c | 12 ++++++------ src/protocol.c | 2 +- src/sip-connection.c | 6 +++--- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/rakia/call-content.c b/rakia/call-content.c index 97f06cb..6ecda3a 100644 --- a/rakia/call-content.c +++ b/rakia/call-content.c @@ -247,7 +247,7 @@ set_telepathy_codecs (RakiaCallContent *self, GHashTable *md_properties) RakiaCallContentPrivate *priv = self->priv; guint i; GPtrArray *tpcodecs = tp_asv_get_boxed (md_properties, - TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS, + TP_PROP_CALL1_CONTENT_MEDIA_DESCRIPTION_CODECS, TP_ARRAY_TYPE_CODEC_LIST); GPtrArray *sipcodecs = g_ptr_array_new_with_free_func ( (GDestroyNotify) rakia_sip_codec_free); diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c index 3c0dc23..aa45eaa 100644 --- a/rakia/connection-aliasing.c +++ b/rakia/connection-aliasing.c @@ -81,7 +81,7 @@ rakia_connection_aliasing_get_type (void) g_type_interface_add_prerequisite (type, RAKIA_TYPE_BASE_CONNECTION); g_type_interface_add_prerequisite (type, - TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING); + TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1); } return type; @@ -142,7 +142,7 @@ conn_get_alias (TpBaseConnection *base, } static void -rakia_connection_request_aliases (TpSvcConnectionInterfaceAliasing *iface, +rakia_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *iface, const GArray *contacts, DBusGMethodInvocation *context) { @@ -181,7 +181,7 @@ rakia_connection_request_aliases (TpSvcConnectionInterfaceAliasing *iface, res = (gchar **) g_array_free (aliases, FALSE); - tp_svc_connection_interface_aliasing_return_from_request_aliases ( + tp_svc_connection_interface_aliasing1_return_from_request_aliases ( context, (const gchar **) res); g_strfreev (res); @@ -198,7 +198,7 @@ emit_self_alias_change (TpBaseConnection *base, const gchar *alias) GUINT_TO_POINTER (tp_base_connection_get_self_handle (base)), (gchar *) alias); - tp_svc_connection_interface_aliasing_emit_aliases_changed (base, change_data); + tp_svc_connection_interface_aliasing1_emit_aliases_changed (base, change_data); g_hash_table_unref (change_data); } @@ -229,7 +229,7 @@ collapse_whitespace (const gchar *str, gchar **to_free) } static void -rakia_connection_set_aliases (TpSvcConnectionInterfaceAliasing *iface, +rakia_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface, GHashTable *aliases, DBusGMethodInvocation *context) { @@ -277,7 +277,7 @@ rakia_connection_set_aliases (TpSvcConnectionInterfaceAliasing *iface, g_free (default_alias); g_free (to_free); - tp_svc_connection_interface_aliasing_return_from_set_aliases (context); + tp_svc_connection_interface_aliasing1_return_from_set_aliases (context); } static void @@ -304,7 +304,7 @@ rakia_conn_aliasing_fill_contact_attributes (GObject *obj, conn_get_alias (base, contact_handles, handle)); tp_contacts_mixin_set_contact_attribute (attributes_hash, handle, - TP_IFACE_CONNECTION_INTERFACE_ALIASING "/alias", val); + TP_IFACE_CONNECTION_INTERFACE_ALIASING1 "/alias", val); } } @@ -312,7 +312,7 @@ void rakia_connection_aliasing_init (gpointer instance) { tp_contacts_mixin_add_contact_attributes_iface (G_OBJECT (instance), - TP_IFACE_CONNECTION_INTERFACE_ALIASING, + TP_IFACE_CONNECTION_INTERFACE_ALIASING1, rakia_conn_aliasing_fill_contact_attributes); } @@ -320,10 +320,10 @@ rakia_connection_aliasing_init (gpointer instance) void rakia_connection_aliasing_svc_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, rakia_connection_##x) IMPLEMENT(request_aliases); IMPLEMENT(set_aliases); diff --git a/rakia/media-manager.c b/rakia/media-manager.c index 2bc0d85..7402cb6 100644 --- a/rakia/media-manager.c +++ b/rakia/media-manager.c @@ -290,15 +290,15 @@ new_call_channel (RakiaMediaManager *fac, if (request_properties != NULL) { 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); 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); dtmf_initial_tones = tp_asv_get_string (request_properties, - TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES); + TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES); } g_object_get (priv->conn, @@ -514,12 +514,12 @@ static const gchar * const media_channel_fixed_properties[] = { static const gchar * const named_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_VIDEO, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_TRANSPORT, - TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME, + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TRANSPORT, + TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES, NULL }; @@ -539,7 +539,7 @@ rakia_media_manager_type_foreach_channel_class (GType type, GValue *value, *handle_type_value; value = tp_g_value_slice_new (G_TYPE_STRING); - g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_CALL); + g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_CALL1); g_hash_table_insert (table, TP_PROP_CHANNEL_CHANNEL_TYPE, value); handle_type_value = tp_g_value_slice_new (G_TYPE_UINT); @@ -549,14 +549,14 @@ rakia_media_manager_type_foreach_channel_class (GType type, g_value_set_uint (handle_type_value, TP_HANDLE_TYPE_CONTACT); - g_hash_table_insert (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, + g_hash_table_insert (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, tp_g_value_slice_new_boolean (TRUE)); func (type, table, named_channel_allowed_properties, user_data); - g_hash_table_remove (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO); + g_hash_table_remove (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO); - g_hash_table_insert (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, + g_hash_table_insert (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, tp_g_value_slice_new_boolean (TRUE)); func (type, table, named_channel_allowed_properties, user_data); @@ -608,14 +608,14 @@ rakia_media_manager_requestotron (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; if (tp_asv_get_boolean (request_properties, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, &valid) && valid) + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, &valid) && valid) initial_audio = TRUE; if (tp_asv_get_boolean (request_properties, - TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, &valid) && valid) + TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, &valid) && valid) initial_audio = TRUE; if (!initial_audio && !initial_video) diff --git a/rakia/text-channel.c b/rakia/text-channel.c index cbdc1c8..c9ec834 100644 --- a/rakia/text-channel.c +++ b/rakia/text-channel.c @@ -58,7 +58,7 @@ G_DEFINE_TYPE_WITH_CODE (RakiaTextChannel, rakia_text_channel, TP_TYPE_BASE_CHAN tp_dbus_properties_mixin_iface_init); 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)); /* properties */ @@ -213,7 +213,7 @@ rakia_text_channel_get_interfaces (TpBaseChannel *base) interfaces = TP_BASE_CHANNEL_CLASS ( rakia_text_channel_parent_class)->get_interfaces (base); - g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE); + g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1); return interfaces; } @@ -360,14 +360,14 @@ rakia_text_channel_close (TpBaseChannel *base) * on interface Channel.Interface.Destroyable */ static void -rakia_text_channel_destroy (TpSvcChannelInterfaceDestroyable *iface, +rakia_text_channel_destroy (TpSvcChannelInterfaceDestroyable1 *iface, DBusGMethodInvocation *context) { tp_message_mixin_clear ((GObject *) iface); rakia_text_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 void @@ -659,9 +659,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, rakia_text_channel_##x) IMPLEMENT(destroy); #undef IMPLEMENT diff --git a/src/protocol.c b/src/protocol.c index b972a5d..a9e9d5c 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -473,7 +473,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/sip-connection.c b/src/sip-connection.c index 9f9a100..4e3b973 100644 --- a/src/sip-connection.c +++ b/src/sip-connection.c @@ -54,7 +54,7 @@ G_DEFINE_TYPE_WITH_CODE (RakiaConnection, rakia_connection, RAKIA_TYPE_BASE_CONNECTION, G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_DBUS_PROPERTIES, tp_dbus_properties_mixin_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1, rakia_connection_aliasing_svc_iface_init); G_IMPLEMENT_INTERFACE (RAKIA_TYPE_CONNECTION_ALIASING, NULL); ); @@ -423,7 +423,7 @@ static gboolean rakia_connection_start_connecting (TpBaseConnection *base, static const gchar *interfaces_always_present[] = { TP_IFACE_CONNECTION_INTERFACE_REQUESTS, TP_IFACE_CONNECTION_INTERFACE_CONTACTS, - TP_IFACE_CONNECTION_INTERFACE_ALIASING, + TP_IFACE_CONNECTION_INTERFACE_ALIASING1, NULL }; const gchar ** @@ -461,7 +461,7 @@ rakia_connection_class_init (RakiaConnectionClass *klass) RakiaBaseConnectionClass *sip_class = RAKIA_BASE_CONNECTION_CLASS (klass); GParamSpec *param_spec; static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = { - { TP_IFACE_CONNECTION_INTERFACE_ALIASING, + { TP_IFACE_CONNECTION_INTERFACE_ALIASING1, conn_aliasing_properties_getter, NULL, conn_aliasing_properties, -- 1.8.3.1