adium.1-4: 72e08818: applied changes from 018335d39d5488d4512...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 72e0881814d7eca026d952630f13fa3564af2b7a
Parent:   f15ef8aec853f0c996199d27a4497b4c90a118ec
Author:   evands at pidgin.im
Date:     02/21/11 17:50:59
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/72e0881814d7eca026d952630f13fa3564af2b7a

Changelog: 

applied changes from 018335d39d5488d4512acce61adbb0318d01334f
             through a657534f694305a613db4946ca8ea9ab4c8f1c1d

Changes against parent f15ef8aec853f0c996199d27a4497b4c90a118ec

  patched  ChangeLog
  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- ChangeLog	9b221e76fccc33208b6ea3a860cdc2fa029fc476
+++ ChangeLog	2706a132221761c93ae5652b0df72cb6665d516c
@@ -1,5 +1,19 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.11 (??/??/????):
+	General:
+	* Our bundled libgadu should now build on HP-UX.
+
+	AIM:
+	* Fix a bug where some buddies from your buddy list might not show up.
+	  Affected non-English ICQ users the most. (#13386)
+
+	XMPP:
+	* Fix building on platforms with an older glib (inadvertantly broken in
+	  2.7.10).  (#13329)
+	* Don't treat the on-join status storms as 'new arrivals'.  (#a14527)
+	  (Thijs Alkemade)
+
 version 2.7.10 (02/06/2011):
 	General:
 	* Force video sources to all have the same capabilities.  This reduces the
============================================================
--- libpurple/protocols/oscar/oscar.c	6a87c0f2de22c9978eb823850e1c9e8b5d67b00f
+++ libpurple/protocols/oscar/oscar.c	09f05925965ca24471da5e878db4d2d415898375
@@ -3953,9 +3953,12 @@ static int purple_ssi_parselist(OscarDat
 	/*** Begin code for adding from server list to local list ***/
 
 	for (curitem=od->ssi.local; curitem; curitem=curitem->next) {
-		if (curitem->name && !g_utf8_validate(curitem->name, -1, NULL))
+		if (curitem->name && !g_utf8_validate(curitem->name, -1, NULL)) {
 			/* Got node with invalid UTF-8 in the name.  Skip it. */
-			break;
+			purple_debug_warning("oscar", "ssi: server list contains item of "
+					"type 0x%04hhx with a non-utf8 name\n", curitem->type);
+			continue;
+		}
 
 		switch (curitem->type) {
 			case AIM_SSI_TYPE_BUDDY: { /* Buddy */