Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/userlist.c @ 21109:e64e6fbd1351
merge_into_workspace of c0e79d15a4fe4c5b0129fcae5060754b25f72a56 and
1bd638d193e3a865ce99ed451afc25d957d7c9a2
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Tue, 30 Oct 2007 06:29:13 +0000 |
parents | aaf800eb7d55 90fd0826c6ce |
children | dead11aac1bc |
comparison
equal
deleted
inserted
replaced
21100:29d8c86c14cd | 21109:e64e6fbd1351 |
---|---|
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); |
681 g_return_if_fail(userlist->session != NULL); | 681 g_return_if_fail(userlist->session != NULL); |
682 | 682 |
683 | 683 |
684 purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name); | 684 purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name); |
685 | 685 |
686 state = msn_callback_state_new(); | 686 state = msn_callback_state_new(userlist->session); |
687 msn_callback_state_set_who(state, who); | 687 msn_callback_state_set_who(state, who); |
688 msn_callback_state_set_new_group_name(state, new_group_name); | 688 msn_callback_state_set_new_group_name(state, new_group_name); |
689 | 689 |
690 if (!purple_email_is_valid(who)) | 690 if (!purple_email_is_valid(who)) |
691 { | 691 { |
842 | 842 |
843 g_return_if_fail(userlist != NULL); | 843 g_return_if_fail(userlist != NULL); |
844 g_return_if_fail(userlist->session != NULL); | 844 g_return_if_fail(userlist->session != NULL); |
845 g_return_if_fail(userlist->session->contact != NULL); | 845 g_return_if_fail(userlist->session->contact != NULL); |
846 | 846 |
847 state = msn_callback_state_new(); | 847 state = msn_callback_state_new(userlist->session); |
848 msn_callback_state_set_who(state, who); | 848 msn_callback_state_set_who(state, who); |
849 msn_callback_state_set_action(state, MSN_MOVE_BUDDY); | 849 msn_callback_state_set_action(state, MSN_MOVE_BUDDY); |
850 msn_callback_state_set_old_group_name(state, old_group_name); | 850 msn_callback_state_set_old_group_name(state, old_group_name); |
851 msn_callback_state_set_new_group_name(state, new_group_name); | 851 msn_callback_state_set_new_group_name(state, new_group_name); |
852 | 852 |