[empathy/next] Adapt for use of ABI versions in generated code
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/next] Adapt for use of ABI versions in generated code
- Date: Thu, 31 Oct 2013 10:00:43 +0000 (UTC)
commit 53287fef25fb43c33f87991be89a0bd2823e3a30
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Oct 28 10:48:37 2013 +0100
Adapt for use of ABI versions in generated code
https://bugzilla.gnome.org/show_bug.cgi?id=710992
libempathy-gtk/empathy-call-utils.c | 6 ++--
libempathy-gtk/empathy-chat.c | 6 ++--
libempathy-gtk/empathy-contact-blocking-dialog.c | 4 +-
libempathy-gtk/empathy-individual-dialogs.c | 2 +-
libempathy-gtk/empathy-individual-menu.c | 2 +-
libempathy-gtk/empathy-individual-widget.c | 2 +-
libempathy-gtk/empathy-location-manager.c | 2 +-
libempathy-gtk/empathy-log-window.c | 6 ++--
libempathy-gtk/empathy-share-my-desktop.c | 4 +-
libempathy-gtk/empathy-subscription-dialog.c | 2 +-
libempathy/empathy-auth-factory.c | 26 ++++++++--------
libempathy/empathy-ft-factory.c | 2 +-
libempathy/empathy-ft-handler.c | 22 +++++++-------
libempathy/empathy-individual-manager.c | 4 +-
libempathy/empathy-request-util.c | 2 +-
libempathy/empathy-sasl-mechanisms.c | 20 ++++++------
libempathy/empathy-server-sasl-handler.c | 4 +-
libempathy/empathy-server-tls-handler.c | 6 ++--
libempathy/empathy-tp-chat.c | 36 +++++++++++-----------
src/empathy-call-factory.c | 16 +++++-----
src/empathy-call-observer.c | 6 ++--
src/empathy-event-manager.c | 24 +++++++-------
src/empathy-invite-participant-dialog.c | 2 +-
23 files changed, 103 insertions(+), 103 deletions(-)
---
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 0689e78..1ce583f 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -78,7 +78,7 @@ empathy_call_create_call_request (const gchar *contact,
{
GHashTable *asv = tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING,
@@ -88,10 +88,10 @@ empathy_call_create_call_request (const gchar *contact,
/* Only add InitialAudio or InitialVideo if they are true: it should work
* with genuinely voice-only CMs. */
if (initial_audio)
- tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
+ tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
initial_audio);
if (initial_video)
- tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
+ tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
initial_video);
return asv;
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 922fa12..17383b7 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -370,7 +370,7 @@ set_chat_state (EmpathyChat *self,
EmpathyChatPriv *priv = GET_PRIV (self);
if (!tp_proxy_has_interface_by_id (priv->tp_chat,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE1))
return;
tp_text_channel_set_chat_state_async (TP_TEXT_CHANNEL (priv->tp_chat), state,
@@ -769,7 +769,7 @@ part_command_supported (EmpathyChat *chat)
EmpathyChatPriv * priv = GET_PRIV (chat);
return tp_proxy_has_interface_by_id (priv->tp_chat,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1);
}
static void
@@ -3450,7 +3450,7 @@ chat_constructed (GObject *object)
TpConnection *conn = tp_channel_get_connection (channel);
gboolean supports_avatars =
tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS);
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS1);
empathy_theme_adium_set_show_avatars (chat->view,
supports_avatars);
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c
b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 96d18fd..62104f4 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -93,7 +93,7 @@ contact_blocking_dialog_filter_account_chooser (TpAccount *account,
enable =
conn != NULL &&
tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING);
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1);
callback (enable, callback_data);
}
@@ -122,7 +122,7 @@ contact_blocking_dialog_refilter_account_chooser (
enabled = (empathy_account_chooser_get_account (chooser) != NULL &&
conn != NULL &&
tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING));
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1));
if (!enabled)
DEBUG ("No account selected");
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 2e388bd..fe6095f 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -212,7 +212,7 @@ empathy_block_individual_dialog_show (GtkWindow *parent,
conn = tp_contact_get_connection (contact);
if (tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
{
s = blocked_str;
npersonas_blocked++;
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 7e1242d..da92d8b 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -535,7 +535,7 @@ get_contacts_supporting_blocking (FolksIndividual *individual)
conn = tp_contact_get_connection (contact);
if (tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
result = g_list_prepend (result, contact);
while_next:
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index fac2c5a..7596d13 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -445,7 +445,7 @@ fetch_contact_information (EmpathyIndividualWidget *self)
connection = tp_contact_get_connection (priv->contact);
if (!tp_proxy_has_interface_by_id (connection,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO))
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO1))
{
gtk_widget_hide (GET_PRIV (self)->vbox_details);
return;
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 219b8a1..8348811 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -152,7 +152,7 @@ publish_location (EmpathyLocationManager *self,
(g_hash_table_size (self->priv->location) == 0 ? "empty" : ""),
conn);
- tp_cli_connection_interface_location_call_set_location (conn, -1,
+ tp_cli_connection_interface_location1_call_set_location (conn, -1,
self->priv->location, publish_location_cb, NULL, NULL, G_OBJECT (self));
}
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 6d8eb40..9ff417e 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -881,7 +881,7 @@ maybe_refresh_logs (TpChannel *channel,
if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_TEXT) &&
!(event_mask & TPL_EVENT_MASK_TEXT))
goto out;
- if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) &&
+ if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL1)) &&
!(event_mask & TPL_EVENT_MASK_CALL))
goto out;
@@ -1023,7 +1023,7 @@ observe_channels (TpSimpleObserver *observer,
tp_g_signal_connect_object (channel, "invalidated",
G_CALLBACK (on_channel_ended), self, 0);
}
- else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL))
+ else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL1))
{
g_hash_table_insert (self->priv->channels,
g_object_ref (channel), g_object_ref (account));
@@ -1062,7 +1062,7 @@ log_window_create_observer (EmpathyLogWindow *self)
tp_base_client_take_observer_filter (self->priv->observer,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
NULL));
tp_base_client_register (self->priv->observer, NULL);
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 1acface..dc0ea77 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -60,12 +60,12 @@ empathy_share_my_desktop_share_with_contact (EmpathyContact *contact)
request = tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
+ TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT,
tp_contact_get_handle (tp_contact),
- TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE, G_TYPE_STRING, "rfb",
+ TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE, G_TYPE_STRING, "rfb",
NULL);
req = tp_account_channel_request_new (empathy_contact_get_account (contact),
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index d7e70bf..7bb3015 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -269,7 +269,7 @@ empathy_subscription_dialog_constructed (GObject *object)
conn = empathy_contact_get_connection (contact);
if (tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
{
gtk_dialog_add_button (GTK_DIALOG (self),
_("_Block"), GTK_RESPONSE_REJECT);
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index a87e916..8ce6586 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -274,14 +274,14 @@ common_checks (EmpathyAuthFactory *self,
channel = channels->data;
if (tp_channel_get_channel_type_id (channel) !=
- TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1)
{
/* If we are observing we care only about ServerAuthentication channels.
* If we are handling we care about ServerAuthentication and
* ServerTLSConnection channels. */
if (observe
|| tp_channel_get_channel_type_id (channel) !=
- TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION)
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION1)
{
g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
"Can only %s ServerTLSConnection or ServerAuthentication channels, "
@@ -296,7 +296,7 @@ common_checks (EmpathyAuthFactory *self,
tp_proxy_get_object_path (channel));
if (tp_channel_get_channel_type_id (channel) ==
- TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1
&& handler != NULL &&
!observe)
{
@@ -346,7 +346,7 @@ handle_channels (TpBaseClient *handler,
/* Only password authentication is supported from here */
if (tp_channel_get_channel_type_id (channel) ==
- TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION &&
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1 &&
!empathy_sasl_channel_supports_mechanism (channel,
"X-TELEPATHY-PASSWORD"))
{
@@ -363,13 +363,13 @@ handle_channels (TpBaseClient *handler,
/* create a handler */
if (tp_channel_get_channel_type_id (channel) ==
- TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION)
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION1)
{
empathy_server_tls_handler_new_async (channel, server_tls_handler_ready_cb,
data);
}
else if (tp_channel_get_channel_type_id (channel) ==
- TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1)
{
empathy_server_sasl_handler_new_async (account, channel,
server_sasl_handler_ready_cb, data);
@@ -658,7 +658,7 @@ empathy_auth_factory_constructed (GObject *obj)
tp_base_client_take_handler_filter (client, tp_asv_new (
/* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION,
+ TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1,
/* AuthenticationMethod */
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_NONE, NULL));
@@ -666,10 +666,10 @@ empathy_auth_factory_constructed (GObject *obj)
tp_base_client_take_handler_filter (client, tp_asv_new (
/* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+ TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
/* AuthenticationMethod */
- TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD,
- G_TYPE_STRING, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+ TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION1_AUTHENTICATION_METHOD,
+ G_TYPE_STRING, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
NULL));
/* We are also an observer so that we can see new auth channels
@@ -682,10 +682,10 @@ empathy_auth_factory_constructed (GObject *obj)
tp_base_client_take_observer_filter (client, tp_asv_new (
/* ChannelType */
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
+ TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
/* AuthenticationMethod */
- TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD,
- G_TYPE_STRING, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+ TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION1_AUTHENTICATION_METHOD,
+ G_TYPE_STRING, TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
NULL));
tp_base_client_set_observer_delay_approvers (client, TRUE);
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 4bb1c3c..9b95972 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -209,7 +209,7 @@ empathy_ft_factory_init (EmpathyFTFactory *self)
tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
/* Only handle *incoming* channels as outgoing FT channels has to be
* handled by the requester. */
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 8e6065f..9a965ed 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -861,20 +861,20 @@ ft_handler_populate_outgoing_request (EmpathyFTHandler *handler)
priv->request = tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT,
contact_handle,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING,
priv->content_type,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_FILENAME, G_TYPE_STRING,
priv->filename,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_SIZE, G_TYPE_UINT64,
priv->total_bytes,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_UINT64,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, G_TYPE_UINT64,
priv->mtime,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI, G_TYPE_STRING, uri,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_URI, G_TYPE_STRING, uri,
NULL);
g_free (uri);
@@ -928,7 +928,7 @@ hash_job_done (gpointer user_data)
* im.telepathy1.Channel.Type.FileTransfer.ContentHash
*/
tp_asv_set_string (priv->request,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH,
g_checksum_get_string (hash_data->checksum));
}
@@ -1068,7 +1068,7 @@ ft_handler_read_async_cb (GObject *source,
hash_data->checksum = g_checksum_new (G_CHECKSUM_MD5);
tp_asv_set_uint32 (priv->request,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE,
+ TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH_TYPE,
TP_FILE_HASH_TYPE_MD5);
g_signal_emit (handler, signals[HASHING_STARTED], 0);
@@ -1112,7 +1112,7 @@ set_content_hash_type_from_classes (EmpathyFTHandler *handler,
chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
- if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+ if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1))
continue;
if (tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) !=
@@ -1122,7 +1122,7 @@ set_content_hash_type_from_classes (EmpathyFTHandler *handler,
support_ft = TRUE;
value = tp_asv_get_uint32
- (fixed, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE,
+ (fixed, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH_TYPE,
&valid);
if (valid)
@@ -1426,7 +1426,7 @@ empathy_ft_handler_new_incoming (TpFileTransferChannel *channel,
channel));
tp_cli_dbus_properties_call_get_all (channel,
- -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+ -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
channel_get_all_properties_cb, data, NULL, G_OBJECT (handler));
}
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index c56f6bb..26907d5 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -795,7 +795,7 @@ empathy_individual_manager_supports_blocking (EmpathyIndividualManager *self,
conn = tp_contact_get_connection (tp_contact);
if (tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
retval = TRUE;
}
}
@@ -835,7 +835,7 @@ empathy_individual_manager_set_blocked (EmpathyIndividualManager *self,
conn = tp_contact_get_connection (tp_contact);
if (!tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING1))
goto while_next;
if (blocked)
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index b053cbd..61449ed 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -72,7 +72,7 @@ create_text_channel (TpAccount *account,
if (sms_channel)
tp_asv_set_boolean (request,
- TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL, TRUE);
+ TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL, TRUE);
req = tp_account_channel_request_new (account, request, timestamp);
tp_account_channel_request_set_delegate_to_preferred_handler (req, TRUE);
diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c
index ffb3aa4..4216ef0 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -78,7 +78,7 @@ sasl_status_changed_cb (TpChannel *channel,
switch (status)
{
case TP_SASL_STATUS_SERVER_SUCCEEDED:
- tp_cli_channel_interface_sasl_authentication_call_accept_sasl (channel,
+ tp_cli_channel_interface_sasl_authentication1_call_accept_sasl (channel,
-1, generic_cb, g_object_ref (result), g_object_unref, NULL);
break;
@@ -118,12 +118,12 @@ empathy_sasl_auth_common_async (TpChannel *channel,
g_return_val_if_fail (TP_IS_CHANNEL (channel), NULL);
g_return_val_if_fail (tp_proxy_has_interface_by_id (channel,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION), NULL);
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION1), NULL);
result = g_simple_async_result_new ((GObject *) channel,
callback, user_data, empathy_sasl_auth_common_async);
- tp_cli_channel_interface_sasl_authentication_connect_to_sasl_status_changed (
+ tp_cli_channel_interface_sasl_authentication1_connect_to_sasl_status_changed (
channel, sasl_status_changed_cb,
g_object_ref (result), g_object_unref, NULL, &error);
g_assert_no_error (error);
@@ -181,7 +181,7 @@ facebook_new_challenge_cb (TpChannel *channel,
response_array = g_array_new (FALSE, FALSE, sizeof (gchar));
g_array_append_vals (response_array, response, strlen (response));
- tp_cli_channel_interface_sasl_authentication_call_respond (data->channel, -1,
+ tp_cli_channel_interface_sasl_authentication1_call_respond (data->channel, -1,
response_array, generic_cb, g_object_ref (result), g_object_unref, NULL);
g_hash_table_unref (h);
@@ -219,13 +219,13 @@ empathy_sasl_auth_facebook_async (TpChannel *channel,
g_simple_async_result_set_op_res_gpointer (result, data,
(GDestroyNotify) facebook_data_free);
- tp_cli_channel_interface_sasl_authentication_connect_to_new_challenge (
+ tp_cli_channel_interface_sasl_authentication1_connect_to_new_challenge (
channel, facebook_new_challenge_cb,
g_object_ref (result), g_object_unref,
NULL, &error);
g_assert_no_error (error);
- tp_cli_channel_interface_sasl_authentication_call_start_mechanism (
+ tp_cli_channel_interface_sasl_authentication1_call_start_mechanism (
channel, -1, MECH_FACEBOOK, generic_cb,
g_object_ref (result), g_object_unref, NULL);
@@ -258,7 +258,7 @@ empathy_sasl_auth_wlm_async (TpChannel *channel,
token_decoded_array = g_array_new (FALSE, FALSE, sizeof (guchar));
g_array_append_vals (token_decoded_array, token_decoded, token_decoded_len);
- tp_cli_channel_interface_sasl_authentication_call_start_mechanism_with_data (
+ tp_cli_channel_interface_sasl_authentication1_call_start_mechanism_with_data (
channel, -1, MECH_WLM, token_decoded_array,
generic_cb, g_object_ref (result), g_object_unref, NULL);
@@ -295,7 +295,7 @@ empathy_sasl_auth_google_async (TpChannel *channel,
g_array_append_val (credential, "\0");
g_array_append_vals (credential, access_token, strlen (access_token));
- tp_cli_channel_interface_sasl_authentication_call_start_mechanism_with_data (
+ tp_cli_channel_interface_sasl_authentication1_call_start_mechanism_with_data (
channel, -1, MECH_GOOGLE, credential,
generic_cb, g_object_ref (result), g_object_unref, NULL);
@@ -325,7 +325,7 @@ empathy_sasl_auth_password_async (TpChannel *channel,
strlen (password));
g_array_append_vals (password_array, password, strlen (password));
- tp_cli_channel_interface_sasl_authentication_call_start_mechanism_with_data (
+ tp_cli_channel_interface_sasl_authentication1_call_start_mechanism_with_data (
channel, -1, MECH_PASSWORD, password_array,
generic_cb, g_object_ref (result), g_object_unref, NULL);
@@ -352,7 +352,7 @@ empathy_sasl_channel_supports_mechanism (TpChannel *channel,
props = tp_channel_dup_immutable_properties (channel);
g_variant_lookup (props,
- TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS,
+ TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_AVAILABLE_MECHANISMS,
"^as", &available_mechanisms);
result = tp_strv_contains ((const gchar * const *) available_mechanisms,
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index c29e0ba..90808f7 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -376,7 +376,7 @@ channel_has_may_save_response (TpChannel *channel)
props = tp_channel_dup_immutable_properties (channel);
if (!g_variant_lookup (props,
- TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE,
+ TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION1_MAY_SAVE_RESPONSE,
"b", &may_save_response))
{
DEBUG ("MaySaveResponse unknown, assuming TRUE");
@@ -455,7 +455,7 @@ empathy_server_sasl_handler_cancel (EmpathyServerSASLHandler *handler)
DEBUG ("Cancelling SASL mechanism...");
- tp_cli_channel_interface_sasl_authentication_call_abort_sasl (
+ tp_cli_channel_interface_sasl_authentication1_call_abort_sasl (
priv->channel, -1, TP_SASL_ABORT_REASON_USER_ABORT,
"User cancelled the authentication",
NULL, NULL, NULL, NULL);
diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index f5f60d6..7afd7b9 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -115,13 +115,13 @@ tls_handler_init_async (GAsyncInitable *initable,
properties = tp_channel_dup_immutable_properties (priv->channel);
g_variant_lookup (properties,
- TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME,
+ TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION1_HOSTNAME,
"s", &priv->hostname);
DEBUG ("Received hostname: %s", priv->hostname);
g_variant_lookup (properties,
- TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_REFERENCE_IDENTITIES,
+ TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION1_REFERENCE_IDENTITIES,
"^as", &priv->reference_identities);
/*
@@ -144,7 +144,7 @@ tls_handler_init_async (GAsyncInitable *initable,
}
g_variant_lookup (properties,
- TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".ServerCertificate",
+ TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1 ".ServerCertificate",
"&o", &cert_object_path);
bus_name = tp_proxy_get_bus_name (TP_PROXY (priv->channel));
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index c6916c1..3f2286f 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -167,7 +167,7 @@ create_conference_cb (GObject *source,
"InviteOnly", G_TYPE_BOOLEAN, TRUE,
NULL);
- tp_cli_channel_interface_room_config_call_update_configuration (channel, -1,
+ tp_cli_channel_interface_room_config1_call_update_configuration (channel, -1,
props, update_config_cb, NULL, NULL, NULL);
g_object_unref (channel);
@@ -182,7 +182,7 @@ empathy_tp_chat_add (EmpathyTpChat *self,
TpChannel *channel = (TpChannel *) self;
if (tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1))
{
TpHandle handle;
GArray handles = {(gchar *) &handle, 1};
@@ -190,7 +190,7 @@ empathy_tp_chat_add (EmpathyTpChat *self,
g_return_if_fail (EMPATHY_IS_CONTACT (contact));
handle = empathy_contact_get_handle (contact);
- tp_cli_channel_interface_group_call_add_members (channel,
+ tp_cli_channel_interface_group1_call_add_members (channel,
-1, &handles, NULL, NULL, NULL, NULL, NULL);
}
else if (self->priv->can_upgrade_to_muc)
@@ -210,9 +210,9 @@ empathy_tp_chat_add (EmpathyTpChat *self,
TP_IFACE_CHANNEL_TYPE_TEXT,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_NONE,
- TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS,
+ TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_CHANNELS,
TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels,
- TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS,
+ TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_IDS,
G_TYPE_STRV, invitees,
/* FIXME: InvitationMessage ? */
NULL);
@@ -635,10 +635,10 @@ tp_chat_dbus_properties_changed_cb (TpProxy *proxy,
{
EmpathyTpChat *self = EMPATHY_TP_CHAT (chat);
- if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_SUBJECT))
+ if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_SUBJECT1))
update_subject (self, changed);
- if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG))
+ if (!tp_strdiff (interface_name, TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1))
update_title (self, changed);
}
@@ -646,7 +646,7 @@ void
empathy_tp_chat_set_subject (EmpathyTpChat *self,
const gchar *subject)
{
- tp_cli_channel_interface_subject_call_set_subject (TP_CHANNEL (self), -1,
+ tp_cli_channel_interface_subject1_call_set_subject (TP_CHANNEL (self), -1,
subject, tp_chat_async_cb, "while setting subject", NULL,
G_OBJECT (self));
}
@@ -1205,7 +1205,7 @@ empathy_tp_chat_can_add_contact (EmpathyTpChat *self)
return self->priv->can_upgrade_to_muc ||
tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);;
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1);;
}
static void
@@ -1243,7 +1243,7 @@ empathy_tp_chat_is_invited (EmpathyTpChat *self,
TpContact *self_contact;
TpChannel *channel = TP_CHANNEL (self);
- if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP))
+ if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP1))
return FALSE;
self_contact = tp_channel_group_get_self_contact (channel);
@@ -1305,7 +1305,7 @@ continue_preparing (EmpathyTpChat *self)
connection = tp_channel_get_connection (channel);
if (tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD1))
{
/* The password feature can't be a hard dep on our own feature has we
* depend on it only if the channel implements the
@@ -1320,7 +1320,7 @@ continue_preparing (EmpathyTpChat *self)
}
if (tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1))
{
GPtrArray *contacts;
TpContact *contact;
@@ -1377,7 +1377,7 @@ continue_preparing (EmpathyTpChat *self)
oprops = g_variant_get_strv (allowed, NULL);
if (tp_strv_contains (oprops,
- TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS))
+ TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_CHANNELS))
{
self->priv->can_upgrade_to_muc = TRUE;
}
@@ -1397,10 +1397,10 @@ continue_preparing (EmpathyTpChat *self)
}
if (tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT1))
{
tp_cli_dbus_properties_call_get_all (channel, -1,
- TP_IFACE_CHANNEL_INTERFACE_SUBJECT,
+ TP_IFACE_CHANNEL_INTERFACE_SUBJECT1,
tp_chat_get_all_subject_cb,
NULL, NULL,
G_OBJECT (self));
@@ -1408,10 +1408,10 @@ continue_preparing (EmpathyTpChat *self)
}
if (tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG1))
{
tp_cli_dbus_properties_call_get_all (channel, -1,
- TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG,
+ TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG1,
tp_chat_get_all_room_config_cb,
NULL, NULL,
G_OBJECT (self));
@@ -1455,7 +1455,7 @@ conn_connected_cb (GObject *source,
}
if (tp_proxy_has_interface_by_id (self,
- TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1))
{
/* If the channel is implementing Group, we need its feature prepared.
* We can't list it as a dependency on EMPATHY_TP_CHAT_FEATURE_READY as
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index bbcb5fc..58233b0 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -66,32 +66,32 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
tp_base_client_take_approver_filter (client, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
NULL));
tp_base_client_take_handler_filter (client, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
NULL));
tp_base_client_take_handler_filter (client, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
- TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
+ TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
NULL));
tp_base_client_take_handler_filter (client, tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
- TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
+ TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
NULL));
tp_base_client_add_handler_capabilities_varargs (client,
@@ -200,7 +200,7 @@ handle_channels (TpBaseClient *client,
continue;
if (tp_channel_get_channel_type_id (channel) !=
- TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ TP_IFACE_QUARK_CHANNEL_TYPE_CALL1)
continue;
if (!TP_IS_CALL_CHANNEL (channel))
@@ -237,7 +237,7 @@ find_call_channel (GList *channels)
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL1)
return TP_CALL_CHANNEL (channel);
}
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 82887b0..72d8d9f 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -147,7 +147,7 @@ find_main_channel (GList *channels)
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL1)
return channel;
}
@@ -165,7 +165,7 @@ has_ongoing_calls (EmpathyCallObserver *self)
GQuark type = tp_channel_get_channel_type_id (channel);
/* Check that Call channels are not ended */
- if (type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL &&
+ if (type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL1 &&
tp_call_channel_get_state (TP_CALL_CHANNEL (channel),
NULL, NULL, NULL) == TP_CALL_STATE_ENDED)
continue;
@@ -327,7 +327,7 @@ empathy_call_observer_init (EmpathyCallObserver *self)
tp_base_client_take_observer_filter (self->priv->observer,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
NULL));
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 077501b..1d9f611 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -438,7 +438,7 @@ reject_approval (EventManagerApproval *approval)
g_object_ref (approval->handler_instance));
}
else if (tp_channel_get_channel_type_id (approval->main_channel)
- == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1)
{
tp_channel_dispatch_operation_close_channels_async (approval->operation,
NULL, NULL);
@@ -612,7 +612,7 @@ event_manager_approval_done (EventManagerApproval *approval)
channel_type = tp_channel_get_channel_type_id (approval->main_channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL1)
{
priv->ringing--;
if (priv->ringing == 0)
@@ -796,9 +796,9 @@ find_main_channel (GList *channels)
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL ||
- channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER ||
- channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL1 ||
+ channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER1 ||
+ channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1)
return channel;
else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT)
@@ -818,7 +818,7 @@ approve_text_channel (EmpathyEventManager *self,
approval->handler_instance = g_object_ref (tp_chat);
- if (tp_proxy_has_interface (tp_chat, TP_IFACE_CHANNEL_INTERFACE_GROUP))
+ if (tp_proxy_has_interface (tp_chat, TP_IFACE_CHANNEL_INTERFACE_GROUP1))
{
/* Are we in local-pending ? */
TpContact *inviter;
@@ -1037,7 +1037,7 @@ approve_channels (TpSimpleApprover *approver,
approve_ft_channel (self, approval, context,
TP_FILE_TRANSFER_CHANNEL (channel));
}
- else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
+ else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1)
{
approve_sasl_channel (self, account, approval, context, channel);
}
@@ -1398,7 +1398,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
tp_base_client_take_approver_filter (priv->approver,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
NULL));
@@ -1406,7 +1406,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
tp_base_client_take_approver_filter (priv->approver,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL1,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
NULL));
@@ -1427,10 +1427,10 @@ empathy_event_manager_init (EmpathyEventManager *manager)
tp_base_client_take_approver_filter (priv->auth_approver,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION,
- TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD,
+ TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
+ TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION1_AUTHENTICATION_METHOD,
G_TYPE_STRING,
- TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION,
+ TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
NULL));
if (!tp_base_client_register (priv->approver, &error))
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 437d8e6..8b0f2ff 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -176,7 +176,7 @@ has_contact_list (EmpathyInviteParticipantDialog *self)
conn = tp_channel_get_connection (TP_CHANNEL (self->priv->tp_chat));
return tp_proxy_has_interface_by_id (conn,
- TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST);
+ TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST1);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
