comparison libpurple/protocols/msn/userlist.c @ 20774:d1e8f4d63f01

merge of '701fb7aea7a77b05725227038ec645441c76668c' and '82ae4511a5006e8f04cd58e034b718deba69321a'
author Carlos Silva <typ0@pidgin.im>
date Thu, 04 Oct 2007 02:42:15 +0000
parents aaf800eb7d55
children 817425918f92 e64e6fbd1351
comparison
equal deleted inserted replaced
20769:712020cd7c8e 20774:d1e8f4d63f01
46 46
47 if (PURPLE_CONNECTION_IS_VALID(pa->gc)) 47 if (PURPLE_CONNECTION_IS_VALID(pa->gc))
48 { 48 {
49 MsnSession *session = pa->gc->proto_data; 49 MsnSession *session = pa->gc->proto_data;
50 MsnUserList *userlist = session->userlist; 50 MsnUserList *userlist = session->userlist;
51 MsnUser *user = msn_userlist_find_add_user(userlist, pa->who, pa->who); 51
52
53
54 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL); 52 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
55 53
56 if (msn_userlist_user_is_in_list(user, MSN_LIST_FL)) 54 msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL);
57 msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL);
58 } 55 }
59 56
60 g_free(pa->who); 57 g_free(pa->who);
61 g_free(pa->friendly); 58 g_free(pa->friendly);
62 g_free(pa); 59 g_free(pa);