# HG changeset patch # User Paul Aurich # Date 1262981509 0 # Node ID 3a43e48c870e8d8bfc537e3cea8f24dab44b4b96 # Parent 711b828d5173c8da365892184a775198c52f4894# Parent 10ec0fbfc790c76ef077d46bafdabc3f5692685d propagate from branch 'im.pidgin.pidgin.2.6.5' (head 794204a24ba7bf26cdb07ae71b9573b09927d641) to branch 'im.pidgin.pidgin' (head 037ff1c0c37fb6717fbc6fe2c658d6f9dda4e148) diff -r 711b828d5173 -r 3a43e48c870e ChangeLog --- a/ChangeLog Fri Jan 08 15:34:10 2010 +0000 +++ b/ChangeLog Fri Jan 08 20:11:49 2010 +0000 @@ -1,17 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.6.5 (??/??/20??): - libpurple: - * TLS certificates are actually stored to the local cache once again - (accepting a name mismatch on a certificate should now be remembered) - - General: - * Build-time fixes for Solaris. (Paul Townsend) - - AIM and ICQ: - * Messages from some mobile clients are no longer displayed as - Chinese characters (broken in 2.6.4) - +version 2.6.6 (??/??/20??): Gadu-Gadu: * Fix display of avatars after a server-side change. (Krzysztof Klinikowski) @@ -31,6 +20,24 @@ * When getting info on a domain-only (server) JID, show uptime (when given by the result of the "last query") and don't show status as offline. + +version 2.6.5 (01/08/2010): + libpurple: + * TLS certificates are actually stored to the local cache once again + (accepting a name mismatch on a certificate should now be remembered) + + General: + * Build-time fixes for Solaris. (Paul Townsend) + + AIM and ICQ: + * Messages from some mobile clients are no longer displayed as + Chinese characters (broken in 2.6.4) + + MSN: + * Fix an issue allowing a remote user to download arbitrary files from + a libpurple client. (CVE-2010-0013) + + XMPP: * Do not crash when attempting to register for a new account on Windows. * Fix file transfer with clients that do not support Entity Capabilities (e.g. Spark) diff -r 711b828d5173 -r 3a43e48c870e ChangeLog.API --- a/ChangeLog.API Fri Jan 08 15:34:10 2010 +0000 +++ b/ChangeLog.API Fri Jan 08 20:11:49 2010 +0000 @@ -1,6 +1,6 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul -version 2.6.5 (??/??/20??): +version 2.6.6 (??/??/2010): libpurple: Changed: * purple_xfer_cancel_local is now called instead of @@ -15,6 +15,9 @@ and Purple::Log:ReadFlags:::: to Purple::Log::ReadFlags::) (Chris Foote) +version 2.6.5 (01/08/2010): + No changes + version 2.6.4 (11/29/2009): No changes diff -r 711b828d5173 -r 3a43e48c870e ChangeLog.win32 --- a/ChangeLog.win32 Fri Jan 08 15:34:10 2010 +0000 +++ b/ChangeLog.win32 Fri Jan 08 20:11:49 2010 +0000 @@ -1,6 +1,10 @@ -version 2.6.5 (??/??/20??): + +version 2.6.6 (??/??/2010): * Installer translations for: Norwegian nynorsk +version 2.6.5 (01/08/2010): + * No changes + version 2.6.4 (11/29/2009): * Register URL handlers for everything that Windows knows about. Still use the HTTP "open" handler for security reasons. diff -r 711b828d5173 -r 3a43e48c870e NEWS --- a/NEWS Fri Jan 08 15:34:10 2010 +0000 +++ b/NEWS Fri Jan 08 20:11:49 2010 +0000 @@ -2,7 +2,12 @@ Our development blog is available at: http://planet.pidgin.im -2.6.5 (??/??/20??): +2.6.6 (??/??/2010): + +2.6.5 (01/08/2010): + Paul: This release fixes a pretty serious bug in the MSN code, so we're + releasing this build a little earlier than planned with only major + bugs fixed. See the ChangeLog for details. Enjoy! 2.6.4 (11/29/2009): John: It's release time again. Lots of bug fixes this time around, as diff -r 711b828d5173 -r 3a43e48c870e configure.ac diff -r 711b828d5173 -r 3a43e48c870e libpurple/account.c diff -r 711b828d5173 -r 3a43e48c870e libpurple/protocols/msn/slp.c --- a/libpurple/protocols/msn/slp.c Fri Jan 08 15:34:10 2010 +0000 +++ b/libpurple/protocols/msn/slp.c Fri Jan 08 20:11:49 2010 +0000 @@ -343,7 +343,6 @@ obj = msn_object_new_from_string(msnobj_data); type = msn_object_get_type(obj); g_free(msnobj_data); - if (type == MSN_OBJECT_EMOTICON) { img = find_valid_emoticon(slplink->session->account, obj->location); } else if (type == MSN_OBJECT_USERTILE) { diff -r 711b828d5173 -r 3a43e48c870e libpurple/protocols/mxit/splashscreen.c diff -r 711b828d5173 -r 3a43e48c870e libpurple/protocols/oscar/oscar.c diff -r 711b828d5173 -r 3a43e48c870e pidgin/gtkconv.c diff -r 711b828d5173 -r 3a43e48c870e po/ChangeLog --- a/po/ChangeLog Fri Jan 08 15:34:10 2010 +0000 +++ b/po/ChangeLog Fri Jan 08 20:11:49 2010 +0000 @@ -1,8 +1,11 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.6.6 + * Norwegian Nynorsk win32 translation added (Yngve Spjeld Landro) + * Russian translation updated (Антон Самохвалов) + version 2.6.5 - * Norwegian Nynorsk win32 translation added (Yngve Spjeld Landro) - * Russian translation updated (Антон Самохвалов) + * No changes version 2.6.4 * Afrikaans translation updated (Friedel Wolff)