comparison: libpurple/protocols/msn/userlist.c
libpurple/protocols/msn/userlist.c
- branch
- cpw.khc.soap
- changeset 21372
- e033d4bd8ae2
- parent 20937
- fc26c8634f73
- parent 21368
- d270fe91b138
- child 22671
- 1be93db097eb
- child 23771
- c98f7e879218
equal
deleted
inserted
replaced
| 21367:d8f93f958500 | 21372:e033d4bd8ae2 |
|---|---|
| 68 | 68 |
| 69 if (PURPLE_CONNECTION_IS_VALID(pa->gc)) | 69 if (PURPLE_CONNECTION_IS_VALID(pa->gc)) |
| 70 { | 70 { |
| 71 MsnSession *session = pa->gc->proto_data; | 71 MsnSession *session = pa->gc->proto_data; |
| 72 MsnUserList *userlist = session->userlist; | 72 MsnUserList *userlist = session->userlist; |
| 73 MsnCallbackState *state = msn_callback_state_new(); | 73 MsnCallbackState *state = msn_callback_state_new(session); |
| 74 | 74 |
| 75 msn_callback_state_set_action(state, MSN_DENIED_BUDDY); | 75 msn_callback_state_set_action(state, MSN_DENIED_BUDDY); |
| 76 | 76 |
| 77 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL); | 77 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL); |
| 78 msn_del_contact_from_list(session->contact, state, pa->who, MSN_LIST_PL); | 78 msn_del_contact_from_list(session->contact, state, pa->who, MSN_LIST_PL); |
| 678 g_return_if_fail(userlist->session != NULL); | 678 g_return_if_fail(userlist->session != NULL); |
| 679 | 679 |
| 680 | 680 |
| 681 purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name); | 681 purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name); |
| 682 | 682 |
| 683 state = msn_callback_state_new(); | 683 state = msn_callback_state_new(userlist->session); |
| 684 msn_callback_state_set_who(state, who); | 684 msn_callback_state_set_who(state, who); |
| 685 msn_callback_state_set_new_group_name(state, new_group_name); | 685 msn_callback_state_set_new_group_name(state, new_group_name); |
| 686 | 686 |
| 687 if (!purple_email_is_valid(who)) | 687 if (!purple_email_is_valid(who)) |
| 688 { | 688 { |
| 839 | 839 |
| 840 g_return_if_fail(userlist != NULL); | 840 g_return_if_fail(userlist != NULL); |
| 841 g_return_if_fail(userlist->session != NULL); | 841 g_return_if_fail(userlist->session != NULL); |
| 842 g_return_if_fail(userlist->session->contact != NULL); | 842 g_return_if_fail(userlist->session->contact != NULL); |
| 843 | 843 |
| 844 state = msn_callback_state_new(); | 844 state = msn_callback_state_new(userlist->session); |
| 845 msn_callback_state_set_who(state, who); | 845 msn_callback_state_set_who(state, who); |
| 846 msn_callback_state_set_action(state, MSN_MOVE_BUDDY); | 846 msn_callback_state_set_action(state, MSN_MOVE_BUDDY); |
| 847 msn_callback_state_set_old_group_name(state, old_group_name); | 847 msn_callback_state_set_old_group_name(state, old_group_name); |
| 848 msn_callback_state_set_new_group_name(state, new_group_name); | 848 msn_callback_state_set_new_group_name(state, new_group_name); |
| 849 | 849 |
