comparison libpurple/account.c @ 21377:872068d10eab

Mark pointed out that PurpleConnectionErrorPair is not a very good name for the struct (what if it gains an extra field in the future?), and John suggested PurpleConnectionErrorInfo, which is an accurate name.

21376:f5b223d0cb89

#include "util.h"
#include "xmlnode.h"

typedef struct
{
	PurpleConnectionErrorPair *current_error;
} PurpleAccountPrivate;

#define PURPLE_ACCOUNT_GET_PRIVATE(account) \
	((PurpleAccountPrivate *) (account->priv))

static void
clear_current_error(PurpleAccount *account)
{
	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
	PurpleConnectionErrorPair *old;

	if (priv->current_error)
	{
		old = priv->current_error;
		priv->current_error = NULL;

                    const gchar *desc,
                    gpointer unused)
{
	PurpleAccount *account = purple_connection_get_account(gc);
	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
	PurpleConnectionErrorPair *old = priv->current_error;

	priv->current_error = g_new0(PurpleConnectionErrorPair, 1);
	priv->current_error->type = err;
	priv->current_error->description = desc;

	purple_signal_emit(purple_accounts_get_handle(),
	                   "account-error-changed",
	                   account, old, priv->current_error);
	g_free(old);
}

const PurpleConnectionErrorPair *
purple_account_get_current_error(PurpleAccount *account)
{
	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
	return priv->current_error;
}

21377:872068d10eab

#include "util.h"
#include "xmlnode.h"

typedef struct
{
	PurpleConnectionErrorInfo *current_error;
} PurpleAccountPrivate;

#define PURPLE_ACCOUNT_GET_PRIVATE(account) \
	((PurpleAccountPrivate *) (account->priv))

static void
clear_current_error(PurpleAccount *account)
{
	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
	PurpleConnectionErrorInfo *old;

	if (priv->current_error)
	{
		old = priv->current_error;
		priv->current_error = NULL;

                    const gchar *desc,
                    gpointer unused)
{
	PurpleAccount *account = purple_connection_get_account(gc);
	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
	PurpleConnectionErrorInfo *old = priv->current_error;

	priv->current_error = g_new0(PurpleConnectionErrorInfo, 1);
	priv->current_error->type = err;
	priv->current_error->description = desc;

	purple_signal_emit(purple_accounts_get_handle(),
	                   "account-error-changed",
	                   account, old, priv->current_error);
	g_free(old);
}

const PurpleConnectionErrorInfo *
purple_account_get_current_error(PurpleAccount *account)
{
	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
	return priv->current_error;
}