# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1240951613 0
# Node ID e7f0570f01cf42f10850f38beec7be84d5286210
# Parent  e0c8f689f60c0ce18c2a779cc919d30996ece17e
applied changes from 6b5084da4501a491dab88006847c4e99fd4ce044
             through c0ad3732e2de434e21818fa9169f9b6835945f74

Add ChangeLog for the above.

diff -r e0c8f689f60c -r e7f0570f01cf ChangeLog
--- a/ChangeLog	Tue Apr 28 20:41:37 2009 +0000
+++ b/ChangeLog	Tue Apr 28 20:46:53 2009 +0000
@@ -6,7 +6,9 @@
 	  channels.
 	* Notify the user if a /nick command fails, rather than trying
 	  fallback nicks.
-	
+
+	Yahoo:
+	* Fix a crash when sending very long messages.
 
 version 2.5.5 (03/01/2009):
 	libpurple:
diff -r e0c8f689f60c -r e7f0570f01cf libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Tue Apr 28 20:41:37 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Tue Apr 28 20:46:53 2009 +0000
@@ -3640,7 +3640,6 @@
 					" bytes, %ld characters.  Max is %d bytes, %d chars."
 					"  Message is '%s'.\n", lenb, lenc, YAHOO_MAX_MESSAGE_LENGTH_BYTES,
 					YAHOO_MAX_MESSAGE_LENGTH_CHARS, msg2);
-			yahoo_packet_free(pkt);
 			g_free(msg);
 			g_free(msg2);
 			return -E2BIG;