changeset 27137:01f1929d0936

propagate from branch 'im.pidgin.pidgin.2.5.7' (head 81e7f59e74715d44dac9e40e7b43ff377c8b474c) to branch 'im.pidgin.pidgin' (head 73090755eac02937743e2c600c5fc83051f2eeac)
author Richard Laager <rlaager@wiktel.com>
date Sun, 21 Jun 2009 16:40:15 +0000
parents 35e642c31f12 (current diff) 6e5c09f66dde (diff)
children 2967cea30d8b
files .todo COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac finch/gntblist.c finch/gntnotify.c finch/libgnt/configure.ac libpurple/buddyicon.c libpurple/circbuffer.c libpurple/conversation.c libpurple/core.c libpurple/mime.c libpurple/plugin.c libpurple/plugin.h libpurple/protocols/bonjour/parser.c libpurple/protocols/irc/msgs.c libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/google.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/message.c libpurple/protocols/jabber/parser.c libpurple/protocols/jabber/parser.h libpurple/protocols/jabber/presence.c libpurple/protocols/msn/contact.c libpurple/protocols/msn/msn.c libpurple/protocols/msn/notification.c libpurple/protocols/msn/oim.c libpurple/protocols/msn/slplink.c libpurple/protocols/msn/soap.c libpurple/protocols/msn/userlist.c libpurple/protocols/msn/userlist.h libpurple/protocols/myspace/myspace.c libpurple/protocols/null/nullprpl.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/peer.c libpurple/protocols/sametime/sametime.c libpurple/protocols/toc/Makefile.am libpurple/protocols/toc/Makefile.mingw libpurple/protocols/toc/PROTOCOL libpurple/protocols/toc/toc.c libpurple/protocols/yahoo/util.c libpurple/protocols/yahoo/yahoo.c libpurple/protocols/yahoo/yahoo.h libpurple/protocols/yahoo/yahoo_packet.h libpurple/protocols/yahoo/yahoo_picture.c libpurple/protocols/zephyr/zephyr.c libpurple/server.c libpurple/util.c libpurple/xmlnode.c pidgin/gtkaccount.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c pidgin/gtkstatusbox.c po/ChangeLog po/de.po
diffstat 3 files changed, 37 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Sun Jun 21 14:24:23 2009 +0000
+++ b/ChangeLog.API	Sun Jun 21 16:40:15 2009 +0000
@@ -128,6 +128,12 @@
 			* Purple::Request::Field::string_new
 			* Purple::Request::Field::group_new
 
+version 2.5.7 (06/20/2009):
+	No changes
+
+version 2.5.6 (05/19/2009):
+	No changes
+
 version 2.5.5 (03/01/2009):
 	libpurple:
 		Changed:
--- a/ChangeLog.win32	Sun Jun 21 14:24:23 2009 +0000
+++ b/ChangeLog.win32	Sun Jun 21 16:40:15 2009 +0000
@@ -1,5 +1,11 @@
 version 2.6.0 (??/??/2009):
 
+version 2.5.7 (06/20/2009):
+	* No changes
+
+version 2.5.6 (05/19/2009):
+	* No changes
+
 version 2.5.5 (03/01/2009):
 	* Remove the "Flash window when chat messages are received" pref from
 	  the Windows Pidgin Options plugin - the Message Notification plugin
--- a/NEWS	Sun Jun 21 14:24:23 2009 +0000
+++ b/NEWS	Sun Jun 21 16:40:15 2009 +0000
@@ -2,26 +2,32 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.5.7 (06/20/2009):
+	John:  This release is really just a rushed fix for the broken Yahoo
+	protocol plugin.  I spent way more time on this release than I care
+	to admit, so I hope that time is well spent and this fixes the issues
+	people have been having.
+
 2.5.6 (05/19/2009):
-    Ka-Hing: Many much bugfixes. Hooray. (Paul told me to say that)
-    Oh, no one has met Paul yet? He's awesome, he backported my fixes
-    to the release branch so I didn't have to checkout a
-    workspace... except I just did to NEWS to tell you all about
-    that. Oh and I actually did do something for this release, none of
-    which is user visible though. This basically applies to the rest
-    of the release as well, nothing exciting, but you definitely want
-    it.
-
-    Daniel: This should fix a number of annoying issues that some users
-    have encountered.  We also would like to thank Veracode
-    (http://www.veracode.com) who performed a code analysis and found some
-    bugs that were addressed in this release.
-
-    Elliott: I feel like I'm repeating myself, but there are some more MSN
-    fixes that should make things better behaved at login as well, and
-    maybe you'll stop getting some of those annoying errors (though not all
-    are fixed yet).  Some other bugfixes, plus the craziness that is the
-    libxml "structured error handler" make up the rest of this release.
+	Ka-Hing: Many much bugfixes. Hooray. (Paul told me to say that)
+	Oh, no one has met Paul yet? He's awesome, he backported my fixes
+	to the release branch so I didn't have to checkout a
+	workspace... except I just did to NEWS to tell you all about
+	that. Oh and I actually did do something for this release, none of
+	which is user visible though. This basically applies to the rest
+	of the release as well, nothing exciting, but you definitely want
+	it.
+
+	Daniel: This should fix a number of annoying issues that some users
+	have encountered.  We also would like to thank Veracode
+	(http://www.veracode.com) who performed a code analysis and found some
+	bugs that were addressed in this release.
+
+	Elliott: I feel like I'm repeating myself, but there are some more MSN
+	fixes that should make things better behaved at login as well, and
+	maybe you'll stop getting some of those annoying errors (though not all
+	are fixed yet).  Some other bugfixes, plus the craziness that is the
+	libxml "structured error handler" make up the rest of this release.
 
 2.5.5 (03/01/2009):
 	John: Well, yet another release with bug fixing and patches.  Hopefully