pidgin: b28bde63: Use NULL for the display name when parsi...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: b28bde636d271fd90efcba54f25ecf7af2e5331b
Parent:   d95c5df9aaf651a9252d56c71f1d27de37ee5527
Author:   qulogic at pidgin.im
Date:     03/01/11 01:23:34
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b28bde636d271fd90efcba54f25ecf7af2e5331b

Changelog: 

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.

Changes against parent d95c5df9aaf651a9252d56c71f1d27de37ee5527

  patched  libpurple/protocols/msn/contact.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	f80010ade42c717c6f485be5c503e81d2757cc48
+++ libpurple/protocols/msn/contact.c	6313dee0bc04d37c5e04d99c036c8fb03921daaf
@@ -363,10 +363,9 @@ msn_parse_each_member(MsnSession *sessio
 	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 @@ msn_parse_each_member(MsnSession *sessio
 
 	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 @@ msn_parse_each_member(MsnSession *sessio
 	g_free(type);
 	g_free(member_id);
 	g_free(invite);
-	g_free(display_text);
 }
 
 static void