#include <telepathy-glib/util.h>
+#include <string.h>
+
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
-#include "empathy-utils.h"
#include "empathy-keyring.h"
enum {
G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init));
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyServerSASLHandler);
-
static const gchar *sasl_statuses[] = {
"not started",
"in progress",
gpointer user_data,
GObject *weak_object)
{
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (weak_object);
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (weak_object)->priv;
/* buh boh */
if (status >= G_N_ELEMENTS (sasl_statuses))
empathy_server_sasl_handler_give_password (gpointer data)
{
EmpathyServerSASLHandler *self = data;
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (self);
+ EmpathyServerSASLHandlerPriv *priv = self->priv;
empathy_server_sasl_handler_provide_password (self,
priv->password, FALSE);
const gchar *password;
GError *error = NULL;
- priv = GET_PRIV (user_data);
+ priv = EMPATHY_SERVER_SASL_HANDLER (user_data)->priv;
password = empathy_keyring_get_password_finish (TP_ACCOUNT (source),
result, &error);
gpointer user_data)
{
EmpathyServerSASLHandler *self = EMPATHY_SERVER_SASL_HANDLER (initable);
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (self);
+ EmpathyServerSASLHandlerPriv *priv = self->priv;
g_assert (priv->account != NULL);
static void
empathy_server_sasl_handler_constructed (GObject *object)
{
- EmpathyServerSASLHandlerPriv *priv;
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
GError *error = NULL;
- priv = GET_PRIV (object);
-
tp_cli_channel_interface_sasl_authentication_connect_to_sasl_status_changed (priv->channel,
sasl_status_changed_cb, NULL, NULL, object, &error);
GValue *value,
GParamSpec *pspec)
{
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (object);
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
switch (property_id)
{
const GValue *value,
GParamSpec *pspec)
{
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (object);
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
switch (property_id)
{
static void
empathy_server_sasl_handler_dispose (GObject *object)
{
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (object);
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
DEBUG ("%p", object);
static void
empathy_server_sasl_handler_finalize (GObject *object)
{
- EmpathyServerSASLHandlerPriv *priv = GET_PRIV (object);
+ EmpathyServerSASLHandlerPriv *priv = EMPATHY_SERVER_SASL_HANDLER (object)->priv;
DEBUG ("%p", object);
g_return_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler));
- priv = GET_PRIV (handler);
+ priv = handler->priv;
array = g_array_sized_new (TRUE, FALSE,
sizeof (gchar), strlen (password));
g_return_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler));
- priv = GET_PRIV (handler);
+ priv = handler->priv;
DEBUG ("Cancelling SASL mechanism...");
g_return_val_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler), NULL);
- priv = GET_PRIV (handler);
+ priv = handler->priv;
return priv->account;
}
g_return_val_if_fail (EMPATHY_IS_SERVER_SASL_HANDLER (handler), FALSE);
- priv = GET_PRIV (handler);
+ priv = handler->priv;
return (priv->password != NULL);
}