# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1214954490 0
# Node ID 60f97d40ddab830e0139913717c3c07a9284c259
# Parent  b5479b576af318b9b788594a9dee9c1f18cc9bcb# Parent  0d5022880ed594091f8a95e949e26bc38853ecd4
merge of '07711878c5fcdc260a917031f095acbe661b342d'
     and '68d4dd5e3045d72a4debf4ab9d39b5e025f8e4c7'

diff -r b5479b576af3 -r 60f97d40ddab ChangeLog
--- a/ChangeLog	Tue Jul 01 21:49:46 2008 +0000
+++ b/ChangeLog	Tue Jul 01 23:21:30 2008 +0000
@@ -5,6 +5,19 @@
 	* Yahoo! Japan now uses UTF-8, matching the behavior of official clients
 	  and restoring compatibility with the web messenger (Yusuke Odate)
 	* Setting your buddy icon once again works for Yahoo! accounts.
+	* Fixes in the Yahoo! protocol to prevent a double free, crashes on
+	  aliases, and alias functionality
+	* Fix crashes in the bonjour protocol
+	* Always use UTF-8 for Yahoo! (#5973)
+	* Fix a crash when the given jabber id is invalid.
+	* Make the IRC "unknown message" debugging messages UTF-8 safe.
+	* Fix setting buddy icons on yahoo.
+	* Fix connecting to ICQ
+	* Fix a memleak when handling jabber xforms.
+
+	Pidgin:
+	* Include the send button plugin in the win32 build
+	* Various memory leak fixes
 
 version 2.4.2 (05/17/2008):
 	libpurple:
diff -r b5479b576af3 -r 60f97d40ddab libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Tue Jul 01 21:49:46 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Tue Jul 01 23:21:30 2008 +0000
@@ -258,6 +258,15 @@
 	"us", "en", \
 }
 
+#define CLIENTINFO_ICQ6_6_0_6059 { \
+	"ICQ Client", \
+	0x010a, \
+	0x0006, 0x0000, \
+	0x0000, 0x17ab, \
+	0x00007535, \
+	"us", "en", \
+}
+
 #define CLIENTINFO_ICQBASIC_14_3_1068 { \
 	"ICQBasic", \
 	0x010a, \
@@ -302,9 +311,9 @@
 #define CLIENTINFO_PURPLE_ICQ { \
 	"Purple/" VERSION, \
 	0x010a, \
-	0x0014, 0x0034, \
-	0x0000, 0x0bb8, \
-	0x0000043d, \
+	0x0006, 0x0000, \
+	0x0000, 0x17ab, \
+	0x00007535, \
 	"us", "en", \
 }