merge of '71cbb3d611d38638f888b6fd83eca09fd88a8bf7'

Sun, 30 Dec 2007 13:56:01 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Sun, 30 Dec 2007 13:56:01 +0000
changeset 22091
1568343b965c
parent 22090
71cbb3d611d3 (current diff)
parent 22089
b61f17ea0f68 (diff)
child 22092
52c00ca73f6f

merge of '71cbb3d611d38638f888b6fd83eca09fd88a8bf7'
and 'b61f17ea0f681951bd730af8d1ead171c97c0362'

--- a/ChangeLog.win32	Sun Dec 30 13:53:57 2007 +0000
+++ b/ChangeLog.win32	Sun Dec 30 13:56:01 2007 +0000
@@ -1,3 +1,6 @@
+version 2.3.1 (12/7/2007):
+	* No changes
+
 version 2.3.0 (11/24/2007):
 	* Updated GTK+ to 2.12.1 (This was actually included in 2.2.2, but 
 	  didn't get into the Changelog.)
@@ -135,7 +138,7 @@
 
 version 0.82 (08/26/2004):
 	* Selecting away messages using the system tray icon works
-	  (Thanks Fran?ois Gagn?)
+	  (Thanks François Gagné)
 	* Transparency plugin will save your settings again (Kevin Stange)
 	* Updated gtk-wimp to 0.6.2
 	* Updated libpng to 1.2.6 (major security update)
--- a/pidgin/gtkconn.c	Sun Dec 30 13:53:57 2007 +0000
+++ b/pidgin/gtkconn.c	Sun Dec 30 13:56:01 2007 +0000
@@ -162,11 +162,6 @@
 		if (info != NULL)
 			g_hash_table_remove(auto_reconns, account);
 
-		/*
-		 * TODO: Do we really want to disable the account when it's
-		 * disconnected by wants_to_die?  This happens when you sign
-		 * on from somewhere else, or when you enter an invalid password.
-		 */
 		purple_account_set_enabled(account, PIDGIN_UI, FALSE);
 	}
 

mercurial