# HG changeset patch
# User Carlos Silva <typ0@pidgin.im>
# Date 1194121169 0
# Node ID 323dfb9642e02fe60ea42184e189cb3c6a0e0b3f
# Parent  f51152557d2f335b03969ba2152d4dcb7617757a# Parent  d0676f639d5aaeac4b2a30701b35ef9bbfa0dcb5
merge of '329395b9793793f35bcf231033c1eb942513ab01'
     and '84fe25ab50712e26d693641a6248e646746904d9'

diff -r f51152557d2f -r 323dfb9642e0 libpurple/protocols/msn/contact.c
--- a/libpurple/protocols/msn/contact.c	Sat Nov 03 19:46:57 2007 +0000
+++ b/libpurple/protocols/msn/contact.c	Sat Nov 03 20:19:29 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)) {