comparison libpurple/protocols/msn/contact.c @ 30416:6ee64d62c43c

merge of '4216577c2d7814344e8e1face579d153098986ad' and 'be2c943ad5ecf372a5ba977319b2be4479e34dcc'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 14 Aug 2010 06:24:04 +0000
parents 9a203ff977f6 cd022bd83677
children f60a1a80036f
comparison
equal deleted inserted replaced
30409:7c9a4235342c 30416:6ee64d62c43c
682 contactNode = xmlnode_get_next_twin(contactNode)) { 682 contactNode = xmlnode_get_next_twin(contactNode)) {
683 xmlnode *contactId, *contactInfo, *contactType, *passportName, *displayName, *guid, *groupIds; 683 xmlnode *contactId, *contactInfo, *contactType, *passportName, *displayName, *guid, *groupIds;
684 xmlnode *annotation; 684 xmlnode *annotation;
685 MsnUser *user; 685 MsnUser *user;
686 686
687 g_free(passport);
688 g_free(Name);
689 g_free(uid);
690 g_free(type);
691 g_free(mobile_number);
692 g_free(alias);
693 passport = Name = uid = type = mobile_number = alias = NULL;
694 mobile = FALSE;
695
687 if (!(contactId = xmlnode_get_child(contactNode,"contactId")) 696 if (!(contactId = xmlnode_get_child(contactNode,"contactId"))
688 || !(contactInfo = xmlnode_get_child(contactNode, "contactInfo")) 697 || !(contactInfo = xmlnode_get_child(contactNode, "contactInfo"))
689 || !(contactType = xmlnode_get_child(contactInfo, "contactType"))) 698 || !(contactType = xmlnode_get_child(contactInfo, "contactType")))
690 continue; 699 continue;
691
692 g_free(passport);
693 g_free(Name);
694 g_free(alias);
695 g_free(uid);
696 g_free(type);
697 g_free(mobile_number);
698 passport = Name = uid = type = mobile_number = alias = NULL;
699 mobile = FALSE;
700 700
701 uid = xmlnode_get_data(contactId); 701 uid = xmlnode_get_data(contactId);
702 type = xmlnode_get_data(contactType); 702 type = xmlnode_get_data(contactType);
703 703
704 /*setup the Display Name*/ 704 /*setup the Display Name*/
834 g_free(passport); 834 g_free(passport);
835 g_free(Name); 835 g_free(Name);
836 g_free(uid); 836 g_free(uid);
837 g_free(type); 837 g_free(type);
838 g_free(mobile_number); 838 g_free(mobile_number);
839 g_free(alias);
839 } 840 }
840 841
841 static gboolean 842 static gboolean
842 msn_parse_addressbook(MsnSession *session, xmlnode *node) 843 msn_parse_addressbook(MsnSession *session, xmlnode *node)
843 { 844 {