From 3daab335b4abb17a1c0c10fda1ff263960b4d45f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 16 Oct 2013 14:48:49 +0100 Subject: [PATCH] Adapt for ABI versions in telepathy-glib codegen --- configure.ac | 2 +- src/mcd-account-addressing.c | 10 +++++----- src/mcd-account-addressing.h | 2 +- src/mcd-account-config.h | 2 +- src/mcd-account-manager.c | 6 +++--- src/mcd-account.c | 38 ++++++++++++++++++------------------- src/mcd-channel.c | 8 +++----- src/mcd-connection-service-points.c | 4 ++-- src/mcd-connection.c | 24 +++++++++++------------ src/mcd-dispatcher.c | 10 +++++----- 10 files changed, 52 insertions(+), 54 deletions(-) diff --git a/configure.ac b/configure.ac index 894b0f4..d382725 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,7 @@ AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) PKG_CHECK_MODULES([TELEPATHY], - [telepathy-glib-1 >= 0.99.1, telepathy-glib-1-dbus >= 0.99.1]) + [telepathy-glib-1 >= 0.99.2.1, telepathy-glib-1-dbus >= 0.99.2.1]) AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_1_0], [Ignore post-1.0 deprecations]) AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_1_0], diff --git a/src/mcd-account-addressing.c b/src/mcd-account-addressing.c index ec3d8f5..d95b9a6 100644 --- a/src/mcd-account-addressing.c +++ b/src/mcd-account-addressing.c @@ -33,7 +33,7 @@ #include "_gen/interfaces.h" static void -addressing_set_uri_scheme_association (TpSvcAccountInterfaceAddressing *iface, +addressing_set_uri_scheme_association (TpSvcAccountInterfaceAddressing1 *iface, const gchar *uri_scheme, gboolean association, DBusGMethodInvocation *context) @@ -86,14 +86,14 @@ addressing_set_uri_scheme_association (TpSvcAccountInterfaceAddressing *iface, NULL); tp_svc_dbus_properties_emit_properties_changed (self, - TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING, changed, NULL); + TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1, changed, NULL); g_hash_table_unref (changed); g_ptr_array_unref (new_schemes); } g_value_unset (&value); - tp_svc_account_interface_addressing_return_from_set_uri_scheme_association ( + tp_svc_account_interface_addressing1_return_from_set_uri_scheme_association ( context); } @@ -121,10 +121,10 @@ const McdDBusProp account_addressing_properties[] = { }; void -account_addressing_iface_init (TpSvcAccountInterfaceAddressingClass *iface, +account_addressing_iface_init (TpSvcAccountInterfaceAddressing1Class *iface, gpointer data) { - #define IMPLEMENT(x) tp_svc_account_interface_addressing_implement_##x (\ + #define IMPLEMENT(x) tp_svc_account_interface_addressing1_implement_##x (\ iface, addressing_##x) IMPLEMENT(set_uri_scheme_association); #undef IMPLEMENT diff --git a/src/mcd-account-addressing.h b/src/mcd-account-addressing.h index 6174046..69243d8 100644 --- a/src/mcd-account-addressing.h +++ b/src/mcd-account-addressing.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS G_GNUC_INTERNAL extern const McdDBusProp account_addressing_properties[]; G_GNUC_INTERNAL void account_addressing_iface_init ( - TpSvcAccountInterfaceAddressingClass *iface, + TpSvcAccountInterfaceAddressing1Class *iface, gpointer data); G_END_DECLS diff --git a/src/mcd-account-config.h b/src/mcd-account-config.h index 8abfbb8..81cf703 100644 --- a/src/mcd-account-config.h +++ b/src/mcd-account-config.h @@ -59,7 +59,7 @@ /* string array, 'as' */ #define MC_ACCOUNTS_KEY_URI_SCHEMES \ - TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING ".URISchemes" + TP_PROP_ACCOUNT_INTERFACE_ADDRESSING1_URI_SCHEMES /* object path array, 'ao' */ #define MC_ACCOUNTS_KEY_SUPERSEDES "Supersedes" diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index d7aef4a..b6890ec 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -818,7 +818,7 @@ _mcd_account_manager_create_account (McdAccountManager *account_manager, } provider = tp_asv_get_string (properties, - TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER); + TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_PROVIDER); unique_name = mcd_storage_create_account (storage, provider, manager, protocol, params, @@ -978,8 +978,8 @@ get_supported_account_properties (TpSvcDBusProperties *svc, TP_IFACE_ACCOUNT ".RequestedPresence", TP_IFACE_ACCOUNT ".Supersedes", TP_PROP_ACCOUNT_SERVICE, - TP_IFACE_ACCOUNT_INTERFACE_AVATAR ".Avatar", - TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER, + TP_PROP_ACCOUNT_INTERFACE_AVATAR1_AVATAR, + TP_PROP_ACCOUNT_INTERFACE_STORAGE1_STORAGE_PROVIDER, NULL }; diff --git a/src/mcd-account.c b/src/mcd-account.c index 810b7bc..8bff915 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -57,10 +57,10 @@ static void account_iface_init (TpSvcAccountClass *iface, gpointer iface_data); static void properties_iface_init (TpSvcDBusPropertiesClass *iface, gpointer iface_data); -static void account_avatar_iface_init (TpSvcAccountInterfaceAvatarClass *iface, +static void account_avatar_iface_init (TpSvcAccountInterfaceAvatar1Class *iface, gpointer iface_data); static void account_storage_iface_init ( - TpSvcAccountInterfaceStorageClass *iface, + TpSvcAccountInterfaceStorage1Class *iface, gpointer iface_data); static void account_external_password_storage_iface_init ( McSvcAccountInterfaceExternalPasswordStorageClass *iface, @@ -73,15 +73,15 @@ static const McdDBusProp account_external_password_storage_properties[]; static const McdInterfaceData account_interfaces[] = { MCD_IMPLEMENT_IFACE (tp_svc_account_get_type, account, TP_IFACE_ACCOUNT), - MCD_IMPLEMENT_IFACE (tp_svc_account_interface_avatar_get_type, + MCD_IMPLEMENT_IFACE (tp_svc_account_interface_avatar1_get_type, account_avatar, - TP_IFACE_ACCOUNT_INTERFACE_AVATAR), - MCD_IMPLEMENT_IFACE (tp_svc_account_interface_storage_get_type, + TP_IFACE_ACCOUNT_INTERFACE_AVATAR1), + MCD_IMPLEMENT_IFACE (tp_svc_account_interface_storage1_get_type, account_storage, - TP_IFACE_ACCOUNT_INTERFACE_STORAGE), - MCD_IMPLEMENT_IFACE (tp_svc_account_interface_addressing_get_type, + TP_IFACE_ACCOUNT_INTERFACE_STORAGE1), + MCD_IMPLEMENT_IFACE (tp_svc_account_interface_addressing1_get_type, account_addressing, - TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING), + TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING1), MCD_IMPLEMENT_OPTIONAL_IFACE ( mc_svc_account_interface_external_password_storage_get_type, account_external_password_storage, @@ -1311,14 +1311,14 @@ mcd_account_send_nickname_to_connection (McdAccount *self, DEBUG ("%s: '%s'", self->priv->unique_name, nickname); if (tp_proxy_has_interface_by_id (self->priv->tp_connection, - TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)) + TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING1)) { GHashTable *aliases = g_hash_table_new (NULL, NULL); g_hash_table_insert (aliases, GUINT_TO_POINTER (tp_contact_get_handle (self->priv->self_contact)), (gchar *) nickname); - tp_cli_connection_interface_aliasing_call_set_aliases ( + tp_cli_connection_interface_aliasing1_call_set_aliases ( self->priv->tp_connection, -1, aliases, mcd_account_set_self_alias_cb, NULL, NULL, NULL); g_hash_table_unref (aliases); @@ -1527,19 +1527,19 @@ mcd_account_send_avatar_to_connection (McdAccount *self, DEBUG ("%s: %u bytes", self->priv->unique_name, avatar->len); if (tp_proxy_has_interface_by_id (self->priv->tp_connection, - TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS)) + TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1)) { self->priv->setting_avatar = TRUE; if (avatar->len > 0 && avatar->len < G_MAXUINT) { - tp_cli_connection_interface_avatars_call_set_avatar ( + tp_cli_connection_interface_avatars1_call_set_avatar ( self->priv->tp_connection, -1, avatar, mime_type, avatars_set_avatar_cb, NULL, NULL, (GObject *) self); } else { - tp_cli_connection_interface_avatars_call_clear_avatar ( + tp_cli_connection_interface_avatars1_call_clear_avatar ( self->priv->tp_connection, -1, avatars_clear_avatar_cb, NULL, NULL, (GObject *) self); } @@ -1580,7 +1580,7 @@ set_avatar (TpSvcDBusProperties *self, const gchar *name, const GValue *value, return FALSE; } - tp_svc_account_interface_avatar_emit_avatar_changed (account); + tp_svc_account_interface_avatar1_emit_avatar_changed (account); return TRUE; } @@ -2194,13 +2194,13 @@ static const McdDBusProp account_storage_properties[] = { }; static void -account_avatar_iface_init (TpSvcAccountInterfaceAvatarClass *iface, +account_avatar_iface_init (TpSvcAccountInterfaceAvatar1Class *iface, gpointer iface_data) { } static void -account_storage_iface_init (TpSvcAccountInterfaceStorageClass *iface, +account_storage_iface_init (TpSvcAccountInterfaceStorage1Class *iface, gpointer iface_data) { } @@ -4158,7 +4158,7 @@ _mcd_account_set_avatar (McdAccount *account, const GArray *avatar, token); if (!prev_token || strcmp (prev_token, token) != 0) - tp_svc_account_interface_avatar_emit_avatar_changed (account); + tp_svc_account_interface_avatar1_emit_avatar_changed (account); g_free (prev_token); } @@ -4899,13 +4899,13 @@ mcd_account_self_contact_upgraded_cb (GObject *source_object, * case for CMs that don't always download an up-to-date * avatar token before signalling CONNECTED. */ if (tp_proxy_has_interface_by_id (conn, - TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS)) + TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1)) { guint self_handle = tp_contact_get_handle (self_contact); GArray *arr = g_array_new (FALSE, FALSE, sizeof (guint)); g_array_append_val (arr, self_handle); - tp_cli_connection_interface_avatars_call_get_known_avatar_tokens ( + tp_cli_connection_interface_avatars1_call_get_known_avatar_tokens ( conn, -1, arr, account_conn_get_known_avatar_tokens_cb, g_object_ref (self_contact), g_object_unref, (GObject *) self); diff --git a/src/mcd-channel.c b/src/mcd-channel.c index ac9ba08..e2ec67d 100644 --- a/src/mcd-channel.c +++ b/src/mcd-channel.c @@ -174,13 +174,11 @@ _mcd_channel_undispatchable (McdChannel *channel) /* Call Destroy() if possible, or Close() */ if (tp_proxy_has_interface_by_id (priv->tp_chan, - TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE)) + TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE1)) { DEBUG ("calling Destroy()"); - tp_cli_channel_interface_destroyable_call_destroy (priv->tp_chan, - -1, NULL, - NULL, NULL, - NULL); + tp_cli_channel_interface_destroyable1_call_destroy (priv->tp_chan, + -1, NULL, NULL, NULL, NULL); } else { diff --git a/src/mcd-connection-service-points.c b/src/mcd-connection-service-points.c index b52abe3..35240e1 100644 --- a/src/mcd-connection-service-points.c +++ b/src/mcd-connection-service-points.c @@ -106,13 +106,13 @@ mcd_connection_service_point_setup (McdConnection *connection, * check the flag though as we only want to do this once per connection: */ if (watch) - tp_cli_connection_interface_service_point_connect_to_service_points_changed + tp_cli_connection_interface_service_point1_connect_to_service_points_changed (tp_conn, service_points_changed_cb, NULL, NULL, (GObject *) connection, NULL); /* fetch the current list to initialise our state */ tp_cli_dbus_properties_call_get (tp_conn, -1, - TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT, + TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT1, "KnownServicePoints", service_points_fetched_cb, NULL, NULL, (GObject *) connection); } diff --git a/src/mcd-connection.c b/src/mcd-connection.c index 49be197..91bd098 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -324,7 +324,7 @@ _mcd_connection_set_presence (McdConnection * connection, _mcd_account_set_changing_presence (priv->account, FALSE); } - tp_cli_connection_interface_presence_call_set_presence + tp_cli_connection_interface_presence1_call_set_presence (priv->tp_conn, -1, adj_status, message, presence_set_status_cb, priv, NULL, (GObject *)connection); } @@ -415,7 +415,7 @@ _mcd_connection_setup_presence (McdConnection *connection) McdConnectionPrivate *priv = connection->priv; tp_cli_dbus_properties_call_get - (priv->tp_conn, -1, TP_IFACE_CONNECTION_INTERFACE_PRESENCE, + (priv->tp_conn, -1, TP_IFACE_CONNECTION_INTERFACE_PRESENCE1, "Statuses", presence_get_statuses_cb, priv, NULL, (GObject *)connection); } @@ -507,7 +507,7 @@ _mcd_connection_setup_power_saving (McdConnection *connection) DEBUG ("is %sactive", mcd_slacker_is_inactive (priv->slacker) ? "in" : ""); if (mcd_slacker_is_inactive (priv->slacker)) - tp_cli_connection_interface_power_saving_call_set_power_saving (priv->tp_conn, -1, + tp_cli_connection_interface_power_saving1_call_set_power_saving (priv->tp_conn, -1, TRUE, NULL, NULL, NULL, NULL); } @@ -1091,7 +1091,7 @@ on_connection_ready (GObject *source_object, GAsyncResult *result, priv = MCD_CONNECTION_PRIV (connection); if (tp_proxy_has_interface_by_id (tp_conn, - TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT)) + TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT1)) { mcd_connection_service_point_setup (connection, !priv->service_points_watched); @@ -1099,11 +1099,11 @@ on_connection_ready (GObject *source_object, GAsyncResult *result, } priv->has_presence_if = tp_proxy_has_interface_by_id - (tp_conn, TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE); + (tp_conn, TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE1); priv->has_contact_capabilities_if = tp_proxy_has_interface_by_id (tp_conn, - TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES); + TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1); priv->has_power_saving_if = tp_proxy_has_interface_by_id (tp_conn, - TP_IFACE_QUARK_CONNECTION_INTERFACE_POWER_SAVING); + TP_IFACE_QUARK_CONNECTION_INTERFACE_POWER_SAVING1); if (priv->has_presence_if) _mcd_connection_setup_presence (connection); @@ -1156,7 +1156,7 @@ _mcd_connection_update_client_caps (McdConnection *self, } DEBUG ("Sending client caps to connection"); - tp_cli_connection_interface_contact_capabilities_call_update_capabilities + tp_cli_connection_interface_contact_capabilities1_call_update_capabilities (self->priv->tp_conn, -1, client_caps, NULL, NULL, NULL, NULL); } @@ -1258,7 +1258,7 @@ mcd_connection_early_get_interfaces_cb (TpProxy *proxy, /* if the interface is not recognised, q will just be 0 */ - if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE) + if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE1) { /* nail on the interface (TpConnection will eventually know * how to do this for itself) */ @@ -1268,11 +1268,11 @@ mcd_connection_early_get_interfaces_cb (TpProxy *proxy, self->priv->tasks_before_connect++; tp_cli_dbus_properties_call_get (tp_conn, -1, - TP_IFACE_CONNECTION_INTERFACE_PRESENCE, "Statuses", + TP_IFACE_CONNECTION_INTERFACE_PRESENCE1, "Statuses", mcd_connection_early_get_statuses_cb, NULL, NULL, (GObject *) self); } - else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES) + else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES1) { GPtrArray *client_caps; @@ -1575,7 +1575,7 @@ on_inactivity_changed (McdSlacker *slacker, priv->has_power_saving_if ? "has" : "doesn't"); if (priv->has_power_saving_if) - tp_cli_connection_interface_power_saving_call_set_power_saving (priv->tp_conn, -1, + tp_cli_connection_interface_power_saving1_call_set_power_saving (priv->tp_conn, -1, inactive, NULL, NULL, NULL, NULL); } diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c index c6833bd..814c406 100644 --- a/src/mcd-dispatcher.c +++ b/src/mcd-dispatcher.c @@ -87,7 +87,7 @@ G_DEFINE_TYPE_WITH_CODE (McdDispatcher, mcd_dispatcher, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (MC_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES_DRAFT, messages_iface_init); G_IMPLEMENT_INTERFACE ( - TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST, + TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1, NULL); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, tp_dbus_properties_mixin_iface_init)) @@ -231,7 +231,7 @@ on_operation_finished (McdDispatchOperation *operation, if (self->priv->operation_list_active && _mcd_dispatch_operation_needs_approval (operation)) { - tp_svc_channel_dispatcher_interface_operation_list_emit_dispatch_operation_finished ( + tp_svc_channel_dispatcher_interface_operation_list1_emit_dispatch_operation_finished ( self, _mcd_dispatch_operation_get_path (operation)); } @@ -282,7 +282,7 @@ _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher, { if (priv->operation_list_active) { - tp_svc_channel_dispatcher_interface_operation_list_emit_new_dispatch_operation ( + tp_svc_channel_dispatcher_interface_operation_list1_emit_new_dispatch_operation ( dispatcher, _mcd_dispatch_operation_get_path (operation), _mcd_dispatch_operation_get_properties (operation)); @@ -356,7 +356,7 @@ _mcd_dispatcher_set_property (GObject * obj, guint prop_id, } static const char * const interfaces[] = { - TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST, + TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1, NULL }; @@ -841,7 +841,7 @@ mcd_dispatcher_class_init (McdDispatcherClass * klass) NULL, cd_props, }, - { TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST, + { TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST1, tp_dbus_properties_mixin_getter_gobject_properties, NULL, op_list_props, -- 1.8.4.rc3