Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/userlist.c Thu Oct 04 01:25:43 2007 +0000 +++ b/libpurple/protocols/msn/userlist.c Thu Oct 04 02:42:15 2007 +0000 @@ -48,13 +48,10 @@ { MsnSession *session = pa->gc->proto_data; MsnUserList *userlist = session->userlist; - MsnUser *user = msn_userlist_find_add_user(userlist, pa->who, pa->who); - - + msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL); - if (msn_userlist_user_is_in_list(user, MSN_LIST_FL)) - msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL); + msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL); } g_free(pa->who);