changeset 27975:b55e1786d131

propagate from branch 'im.pidgin.pidgin' (head 8351342d3a30c75649de9c3d4abc7b6f45ce8f82) to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head 528b570781af89769141bd6addc8b1a124fed185)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sat, 01 Aug 2009 16:11:30 +0000
parents a8b61c00ceda (current diff) b6a9e2079d50 (diff)
children 0ab7b436a563
files libpurple/protocols/yahoo/libymsg.c
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c	Sat Aug 01 15:50:06 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sat Aug 01 16:11:30 2009 +0000
@@ -2035,7 +2035,6 @@
 	char *fullmsg;
 	PurpleAccount *account = gc->account;
 	PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
-	gboolean reconnect = FALSE;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -2087,8 +2086,8 @@
 	case 52:
 		/* See #9660. As much as we know, reconnecting shouldn't hurt */
 		purple_debug_info("yahoo", "Got error 52, Set to autoreconnect\n");
-		reconnect = TRUE;
 		msg = g_strdup_printf(_("Unknown error"));
+		reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		break;
 	case 1013:
 		msg = g_strdup(_("Error 1013: The username you have entered is invalid."
@@ -2108,10 +2107,6 @@
 	purple_connection_error_reason(gc, reason, fullmsg);
 	g_free(msg);
 	g_free(fullmsg);
-
-	/* In case of error 52, we reconnect */
-	if(reconnect)
-		purple_account_connect(account);
 }
 
 static void yahoo_process_addbuddy(PurpleConnection *gc, struct yahoo_packet *pkt)