Mercurial > pidgin
changeset 21128:323dfb9642e0
merge of '329395b9793793f35bcf231033c1eb942513ab01'
and '84fe25ab50712e26d693641a6248e646746904d9'
| author | Carlos Silva <typ0@pidgin.im> |
|---|---|
| date | Sat, 03 Nov 2007 20:19:29 +0000 |
| parents | f51152557d2f (current diff) d0676f639d5a (diff) |
| children | aed98822d825 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)) {