# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1194121319 0
# Node ID aed98822d825ac8f39d528b6bac3a73f177b65dc
# Parent  68fc9d5c43f7d4ac7e008bb0d77740fbfa1a2bff# Parent  323dfb9642e02fe60ea42184e189cb3c6a0e0b3f
merge of '9d8120be512c235d76a8f6fee60cae024da8772e'
     and 'db2e3703b266820d3b1c3f65a5b8ce05163f62de'

diff -r 68fc9d5c43f7 -r aed98822d825 libpurple/protocols/msn/contact.c
--- a/libpurple/protocols/msn/contact.c	Sat Nov 03 20:20:06 2007 +0000
+++ b/libpurple/protocols/msn/contact.c	Sat Nov 03 20:21:59 2007 +0000
@@ -236,11 +236,12 @@
 	MsnListId list)
 {
 	char *passport = xmlnode_get_data(xmlnode_get_child(member, node));
-	char *type = xmlnode_get_data(xmlnode_get_child(member, "type"));
+	char *type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
 	char *member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
 	MsnUser *user = msn_userlist_find_add_user(session->userlist, passport, NULL);
 
-	purple_debug_info("msncl","%s name: %s, Type: %s\n", node, passport, type);
+	purple_debug_info("msncl","%s name: %s, Type: %s, MembershipID: %s\n",
+		node, passport, type, member_id == NULL ? "(null)" : member_id);
 
 	if (member_id) {
 		user->membership_id[list] = atoi(member_id);
@@ -282,7 +283,7 @@
 				xmlnode *member;
 
 				purple_debug_info("msncl", "MemberRole role: %s, list: %d\n",
-					role, list);
+					role_str, list);
 
 				for (member = msn_soap_xml_get(membership, "Members/Member");
 					 member; member = xmlnode_get_next_twin(member)) {