comparison libpurple/protocols/msn/userlist.c @ 32819:2c6510167895 default tip

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents b48dfbb514d3
children
comparison
equal deleted inserted replaced
32818:01ff09d4a463 32819:2c6510167895
52 52
53 purple_debug_misc("msn", "Accepted the new buddy: %s\n", pa->who); 53 purple_debug_misc("msn", "Accepted the new buddy: %s\n", pa->who);
54 54
55 if (PURPLE_CONNECTION_IS_VALID(pa->gc)) 55 if (PURPLE_CONNECTION_IS_VALID(pa->gc))
56 { 56 {
57 MsnSession *session = pa->gc->proto_data; 57 MsnSession *session = purple_connection_get_protocol_data(pa->gc);
58 MsnUserList *userlist = session->userlist; 58 MsnUserList *userlist = session->userlist;
59 PurpleAccount *account = purple_connection_get_account(pa->gc); 59 PurpleAccount *account = purple_connection_get_account(pa->gc);
60 60
61 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL); 61 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
62 purple_privacy_deny_remove(account, pa->who, TRUE); 62 purple_privacy_deny_remove(account, pa->who, TRUE);
77 77
78 purple_debug_misc("msn", "Denied the new buddy: %s\n", pa->who); 78 purple_debug_misc("msn", "Denied the new buddy: %s\n", pa->who);
79 79
80 if (PURPLE_CONNECTION_IS_VALID(pa->gc)) 80 if (PURPLE_CONNECTION_IS_VALID(pa->gc))
81 { 81 {
82 MsnSession *session = pa->gc->proto_data; 82 MsnSession *session = purple_connection_get_protocol_data(pa->gc);
83 MsnUserList *userlist = session->userlist; 83 MsnUserList *userlist = session->userlist;
84 MsnCallbackState *state = msn_callback_state_new(session); 84 MsnCallbackState *state = msn_callback_state_new(session);
85 85
86 msn_callback_state_set_action(state, MSN_DENIED_BUDDY); 86 msn_callback_state_set_action(state, MSN_DENIED_BUDDY);
87 87