# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1298960614 0
# Node ID 69094d578a452d711aafa49bfc5b43b7aa0737af
# Parent  f60a5bec2a0d7bfaee598c4866e5b6f42a757b78
Use NULL for the display name when parsing the the privacy member
lists. The display names on this list are totally bogus and outdated,
causing old names to show up when somebody adds you to their list.
Along with the previous commit, this will ignore the display names
from there.

Fixes #12030.

diff -r f60a5bec2a0d -r 69094d578a45 libpurple/protocols/msn/contact.c
--- a/libpurple/protocols/msn/contact.c	Tue Mar 01 06:16:04 2011 +0000
+++ b/libpurple/protocols/msn/contact.c	Tue Mar 01 06:23:34 2011 +0000
@@ -363,10 +363,9 @@
 	char *type;
 	char *member_id;
 	MsnUser *user;
-	xmlnode *annotation, *display;
+	xmlnode *annotation;
 	guint nid = MSN_NETWORK_UNKNOWN;
 	char *invite = NULL;
-	char *display_text;
 
 	passport = xmlnode_get_data(xmlnode_get_child(member, node));
 	if (!msn_email_is_valid(passport)) {
@@ -376,13 +375,8 @@
 
 	type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
 	member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
-	if ((display = xmlnode_get_child(member, "DisplayName"))) {
-		display_text = xmlnode_get_data(display);
-	} else {
-		display_text = NULL;
-	}
 
-	user = msn_userlist_find_add_user(session->userlist, passport, display_text);
+	user = msn_userlist_find_add_user(session->userlist, passport, NULL);
 
 	for (annotation = xmlnode_get_child(member, "Annotations/Annotation");
 	     annotation;
@@ -423,7 +417,6 @@
 	g_free(type);
 	g_free(member_id);
 	g_free(invite);
-	g_free(display_text);
 }
 
 static void