diff options
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-auth-factory.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-server-tls-handler.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index fdd38b517..04e619bd0 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -37,8 +37,6 @@ #include "empathy-uoa-auth-handler.h" #endif /* HAVE_UOA */ -#include "extensions.h" - #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" @@ -283,7 +281,7 @@ common_checks (EmpathyAuthFactory *self, * ServerTLSConnection channels. */ if (observe || tp_channel_get_channel_type_id (channel) != - EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) + TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) { g_set_error (error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Can only %s ServerTLSConnection or ServerAuthentication channels, " @@ -365,7 +363,7 @@ handle_channels (TpBaseClient *handler, /* create a handler */ if (tp_channel_get_channel_type_id (channel) == - EMP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) + TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION) { empathy_server_tls_handler_new_async (channel, server_tls_handler_ready_cb, data); @@ -660,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, - EMP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, + TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION, /* AuthenticationMethod */ TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE, NULL)); diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c index 0ac2a1f30..f5f60d649 100644 --- a/libempathy/empathy-server-tls-handler.c +++ b/libempathy/empathy-server-tls-handler.c @@ -24,7 +24,6 @@ #include <telepathy-glib/telepathy-glib-dbus.h> #include "empathy-utils.h" -#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" @@ -145,7 +144,7 @@ tls_handler_init_async (GAsyncInitable *initable, } g_variant_lookup (properties, - EMP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".ServerCertificate", + TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION ".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 f76c5b92b..6d2d0a9c9 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -967,13 +967,14 @@ static const TpProxyFeature * tp_chat_list_features (TpProxyClass *cls G_GNUC_UNUSED) { static TpProxyFeature features[N_FEAT + 1] = { { 0 } }; - static GQuark need[2] = {0, 0}; + static GQuark need[3] = {0, 0, 0}; if (G_LIKELY (features[0].name != 0)) return features; features[FEAT_READY].name = EMPATHY_TP_CHAT_FEATURE_READY; need[0] = TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES; + need[1] = TP_CHANNEL_FEATURE_CONTACTS; features[FEAT_READY].depends_on = need; features[FEAT_READY].prepare_async = tp_chat_prepare_ready_async; diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 9ee9606cc..e83493736 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -415,7 +415,7 @@ empathy_account_manager_get_accounts_connected (gboolean *connecting) manager = tp_account_manager_dup (); - if (G_UNLIKELY (!tp_account_manager_is_prepared (manager, + if (G_UNLIKELY (!tp_proxy_is_prepared (manager, TP_ACCOUNT_MANAGER_FEATURE_CORE))) g_critical (G_STRLOC ": %s called before AccountManager ready", G_STRFUNC); |