Mercurial > pidgin.yaz
changeset 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.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sun, 28 Oct 2007 23:10:08 +0000 |
| parents | f5b223d0cb89 |
| children | c1033e943d2a |
| files | ChangeLog.API doc/account-signals.dox libpurple/account.c libpurple/account.h libpurple/connection.h pidgin/gtkblist.c |
| diffstat | 6 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sun Oct 28 18:03:14 2007 +0000 +++ b/ChangeLog.API Sun Oct 28 23:10:08 2007 +0000 @@ -32,7 +32,7 @@ to whether automatic reconnection should be attempted after a connection error (rather than checking gc->wants_to_die). - * PurpleConnectionErrorPair, a struct to hold a + * PurpleConnectionErrorInfo, a struct to hold a PurpleConnectionError and a const char *description. * purple_account_get_current_error() to get the most recent PurpleConnectionError and description (or NULL if the
--- a/doc/account-signals.dox Sun Oct 28 18:03:14 2007 +0000 +++ b/doc/account-signals.dox Sun Oct 28 23:10:08 2007 +0000 @@ -144,7 +144,7 @@ @signaldef account-error-changed @signalproto -void (*account_error_changed)(PurpleAccount *account, const PurpleConnectionErrorPair *old_error, const PurpleConnectionErrorPair *current_error); +void (*account_error_changed)(PurpleAccount *account, const PurpleConnectionErrorInfo *old_error, const PurpleConnectionErrorInfo *current_error); @endsignalproto @signaldesc Emitted when @a account's error changes.
--- a/libpurple/account.c Sun Oct 28 18:03:14 2007 +0000 +++ b/libpurple/account.c Sun Oct 28 23:10:08 2007 +0000 @@ -43,7 +43,7 @@ typedef struct { - PurpleConnectionErrorPair *current_error; + PurpleConnectionErrorInfo *current_error; } PurpleAccountPrivate; #define PURPLE_ACCOUNT_GET_PRIVATE(account) \ @@ -2236,7 +2236,7 @@ clear_current_error(PurpleAccount *account) { PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account); - PurpleConnectionErrorPair *old; + PurpleConnectionErrorInfo *old; if (priv->current_error) { @@ -2266,9 +2266,9 @@ { 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); + PurpleConnectionErrorInfo *old = priv->current_error; + + priv->current_error = g_new0(PurpleConnectionErrorInfo, 1); priv->current_error->type = err; priv->current_error->description = desc; @@ -2278,7 +2278,7 @@ g_free(old); } -const PurpleConnectionErrorPair * +const PurpleConnectionErrorInfo * purple_account_get_current_error(PurpleAccount *account) { PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
--- a/libpurple/account.h Sun Oct 28 18:03:14 2007 +0000 +++ b/libpurple/account.h Sun Oct 28 23:10:08 2007 +0000 @@ -903,7 +903,7 @@ * @constreturn The type of error and a human-readable description of the * current error, or @c NULL if there is no current error. */ -const PurpleConnectionErrorPair *purple_account_get_current_error(PurpleAccount *account); +const PurpleConnectionErrorInfo *purple_account_get_current_error(PurpleAccount *account); /*@}*/
--- a/libpurple/connection.h Sun Oct 28 18:03:14 2007 +0000 +++ b/libpurple/connection.h Sun Oct 28 23:10:08 2007 +0000 @@ -133,7 +133,7 @@ PurpleConnectionError type; /** A localised, human-readable description of the error. */ const char *description; -} PurpleConnectionErrorPair; +} PurpleConnectionErrorInfo; #include <time.h>
--- a/pidgin/gtkblist.c Sun Oct 28 18:03:14 2007 +0000 +++ b/pidgin/gtkblist.c Sun Oct 28 23:10:08 2007 +0000 @@ -4395,8 +4395,8 @@ static void update_account_error_state(PurpleAccount *account, - PurpleConnectionErrorPair *old, - PurpleConnectionErrorPair *new, + PurpleConnectionErrorInfo *old, + PurpleConnectionErrorInfo *new, PidginBuddyList *gtkblist) { if (new)