Mercurial > pidgin
changeset 21966:1796af35d1aa
merge of '1e815cbbfe7f16f64d88932b88cb027889830b52'
and 'ab1f862345e47812fec7760608491c0a24d9c03e'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 30 Dec 2007 13:56:01 +0000 |
| parents | 6a48fc471505 (current diff) 5c3c79fcc849 (diff) |
| children | 33f4a9e685a3 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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); }