im.pidgin.cpw.resiak.disconnectreason: 3b3ca2daa4c8b9569125de967dc8f9b6f680ccae

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 3b3ca2daa4c8b9569125de967dc8f9b6f680ccae
Ancestor: 0659b40dd6696c0a81d1d0ee9a1470864665841c
Author: resiak at soc.pidgin.im
Date: 2007-10-28T23:10:08
Branch: im.pidgin.cpw.resiak.disconnectreason

Modified files:
        ChangeLog.API doc/account-signals.dox libpurple/account.c
        libpurple/account.h libpurple/connection.h pidgin/gtkblist.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- ChangeLog.API	e740ffd3542f04b371ec742d375d93dc7f99e43a
+++ ChangeLog.API	03a52f1864a03d98a6deefa5d1f894ff11c351e0
@@ -32,7 +32,7 @@ version 2.3.0 (??/??/????):
 		  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
============================================================
--- doc/account-signals.dox	14bc9be04766dccd72005d08466bdd417fa7f63e
+++ doc/account-signals.dox	79d2864a4cedc1e9728f453590302bf996008acf
@@ -144,7 +144,7 @@ void (*account_authorization_granted)(Pu
 
  @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.
============================================================
--- libpurple/account.c	e02175554aaf9674cc6e78d74442a75e6e576bb4
+++ libpurple/account.c	4fe840a4238c15f107ec994d179046c2ac785677
@@ -43,7 +43,7 @@ typedef struct
 
 typedef struct
 {
-	PurpleConnectionErrorPair *current_error;
+	PurpleConnectionErrorInfo *current_error;
 } PurpleAccountPrivate;
 
 #define PURPLE_ACCOUNT_GET_PRIVATE(account) \
@@ -2236,7 +2236,7 @@ clear_current_error(PurpleAccount *accou
 clear_current_error(PurpleAccount *account)
 {
 	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
-	PurpleConnectionErrorPair *old;
+	PurpleConnectionErrorInfo *old;
 
 	if (priv->current_error)
 	{
@@ -2266,9 +2266,9 @@ connection_error_cb(PurpleConnection *gc
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
-	PurpleConnectionErrorPair *old = priv->current_error;
+	PurpleConnectionErrorInfo *old = priv->current_error;
 
-	priv->current_error = g_new0(PurpleConnectionErrorPair, 1);
+	priv->current_error = g_new0(PurpleConnectionErrorInfo, 1);
 	priv->current_error->type = err;
 	priv->current_error->description = desc;
 
@@ -2278,7 +2278,7 @@ connection_error_cb(PurpleConnection *gc
 	g_free(old);
 }
 
-const PurpleConnectionErrorPair *
+const PurpleConnectionErrorInfo *
 purple_account_get_current_error(PurpleAccount *account)
 {
 	PurpleAccountPrivate *priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
============================================================
--- libpurple/account.h	7b2a6cbcbd5a24bd4bb0b62bf5998874f635cf7e
+++ libpurple/account.h	58dde9ed7c9165605e148c61d8c881308c98b45f
@@ -903,7 +903,7 @@ gboolean purple_account_supports_offline
  * @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);
 
 /*@}*/
 
============================================================
--- libpurple/connection.h	8dc024c9a64f83c975fd4448e5d7cd5aad61fb33
+++ libpurple/connection.h	d67e3f6ef065c4ff48eba7d0ceae57397d8ed6ed
@@ -133,7 +133,7 @@ typedef struct
 	PurpleConnectionError type;
 	/** A localised, human-readable description of the error. */
 	const char *description;
-} PurpleConnectionErrorPair;
+} PurpleConnectionErrorInfo;
 
 #include <time.h>
 
============================================================
--- pidgin/gtkblist.c	519ceab505a37fa92886b0742de134c00952e7a4
+++ pidgin/gtkblist.c	445b149897591c2e6b0ceeaccf5ae5a7f6e17f91
@@ -4395,8 +4395,8 @@ update_account_error_state(PurpleAccount
 
 static void
 update_account_error_state(PurpleAccount *account,
-                           PurpleConnectionErrorPair *old,
-                           PurpleConnectionErrorPair *new,
+                           PurpleConnectionErrorInfo *old,
+                           PurpleConnectionErrorInfo *new,
                            PidginBuddyList *gtkblist)
 {
 	if (new)