#include "config.h"
#include "empathy-auth-factory.h"
-#include "empathy-keyring.h"
+#include <telepathy-glib/telepathy-glib-dbus.h>
+#include <tp-account-widgets/tpaw-keyring.h>
+
#include "empathy-sasl-mechanisms.h"
#include "empathy-server-sasl-handler.h"
#include "empathy-server-tls-handler.h"
#include "empathy-uoa-auth-handler.h"
#endif /* HAVE_UOA */
-#include "extensions.h"
-
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include "empathy-debug.h"
* 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, "
/* 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);
{
ObserveChannelsData *data = user_data;
- if (empathy_keyring_get_account_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
+ if (tpaw_keyring_get_account_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
{
/* We don't actually mind if this fails, just let the approver
* go ahead and take the channel. */
return;
}
- empathy_keyring_get_account_password_async (data->account,
+ tpaw_keyring_get_account_password_async (data->account,
get_password_cb, data);
tp_observe_channels_context_delay (context);
return;
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));