Mercurial > pidgin.yaz

--- a/ChangeLog	Wed Jan 06 22:51:29 2010 +0900
+++ b/ChangeLog	Thu Jan 14 07:23:35 2010 +0900
@@ -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)
--- a/ChangeLog.API	Wed Jan 06 22:51:29 2010 +0900
+++ b/ChangeLog.API	Thu Jan 14 07:23:35 2010 +0900
@@ -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::::<type> to
 		  Purple::Log::ReadFlags::<type>)  (Chris Foote)

+version 2.6.5 (01/08/2010):
+	No changes
+
 version 2.6.4 (11/29/2009):
 	No changes
--- a/ChangeLog.win32	Wed Jan 06 22:51:29 2010 +0900
+++ b/ChangeLog.win32	Thu Jan 14 07:23:35 2010 +0900
@@ -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.
--- a/NEWS	Wed Jan 06 22:51:29 2010 +0900
+++ b/NEWS	Thu Jan 14 07:23:35 2010 +0900
@@ -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
--- a/configure.ac	Wed Jan 06 22:51:29 2010 +0900
+++ b/configure.ac	Thu Jan 14 07:23:35 2010 +0900
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [6])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [6])
-m4_define([purple_micro_version], [5])
+m4_define([purple_micro_version], [6])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@
 m4_define([gnt_lt_current], [6])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [6])
-m4_define([gnt_micro_version], [5])
+m4_define([gnt_micro_version], [6])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
--- a/libpurple/protocols/msn/slp.c	Wed Jan 06 22:51:29 2010 +0900
+++ b/libpurple/protocols/msn/slp.c	Thu Jan 14 07:23:35 2010 +0900
@@ -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) {
--- a/po/ChangeLog	Wed Jan 06 22:51:29 2010 +0900
+++ b/po/ChangeLog	Thu Jan 14 07:23:35 2010 +0900
@@ -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)
--- a/po/de.po	Wed Jan 06 22:51:29 2010 +0900
+++ b/po/de.po	Thu Jan 14 07:23:35 2010 +0900
@@ -2,7 +2,7 @@
 # Pidgin German translation
 # Copyright (C) 2001, Daniel Seifert <Pidgin-translation@dseifert.de>
 # Copyright (C) 2002, Karsten Weiss <knweiss@gmx.de>
-# Copyright (C) 2002-2009, Björn Voigt <bjoern@cs.tu-berlin.de>,
+# Copyright (C) 2002-2010, Björn Voigt <bjoern@cs.tu-berlin.de>,
 #                     Jochen Kemnade <jochenkemnade@web.de>
 #
 # This file is distributed under the same license as the Pidgin package.
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-06 09:43+0100\n"
-"PO-Revision-Date: 2010-01-06 09:39+0100\n"
-"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
+"POT-Creation-Date: 2010-01-08 16:32+0100\n"
+"PO-Revision-Date: 2010-01-08 16:30+0100\n"
+"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3868,11 +3868,9 @@
 msgid "SASL error: %s"
 msgstr "SASL-Fehler: %s"

-#, fuzzy
 msgid "Unable to canonicalize username"
 msgstr "Benutzername konnte nicht in Normalform gebracht werden"

-#, fuzzy
 msgid "Unable to canonicalize password"
 msgstr "Passwort konnte nicht in Normalform gebracht werden"