# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1236148460 0
# Node ID 3dd634ed516c68165c73431f95a4d93bc7ca7368
# Parent  f0864ef7aa5b2eda44135ebb980bb562b2edd41e# Parent  a4fea5757d27e27328a5f1edafedea962c084e4d
merge of '4f7ebd10f9b2db16fa68b60e528f766e6c9dd450'
     and 'fc6844685b98c3ba0c8860d00c057d51b436abf2'

diff -r f0864ef7aa5b -r 3dd634ed516c ChangeLog
--- a/ChangeLog	Wed Mar 04 06:29:36 2009 +0000
+++ b/ChangeLog	Wed Mar 04 06:34:20 2009 +0000
@@ -18,9 +18,6 @@
 	* Pressing the Enter key in the message entry box of the New Status
 	  dialog and various other dialogs now causes the cursor to move to
 	  the next line.
-	* Authentication failures now clear the account password, causing Pidgin
-	  to prompt for the password when clicking the "Re-enable" button on the
-	  minidialog.
 
 version 2.5.5 (03/01/2009):
 	libpurple:
diff -r f0864ef7aa5b -r 3dd634ed516c pidgin/gtkconn.c
--- a/pidgin/gtkconn.c	Wed Mar 04 06:29:36 2009 +0000
+++ b/pidgin/gtkconn.c	Wed Mar 04 06:34:20 2009 +0000
@@ -163,11 +163,6 @@
 			g_hash_table_remove(auto_reconns, account);
 
 		purple_account_set_enabled(account, PIDGIN_UI, FALSE);
-
-		/* clear the saved password if this is an authentication failure */
-		if(reason == PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED)
-			purple_account_set_password(account, NULL);
-			
 	}
 
 	/* If we have any open chats, we probably want to rejoin when we get back online. */