comparison libpurple/protocols/msn/userlist.c @ 20538:90fd0826c6ce

finish converting the rest of stuff to the new soap api, signing on, getting address book seems to work, other blist management stuff not tested yet
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 24 Oct 2007 06:35:54 +0000
parents bd60afa72fce
children aa875e77e5ce e64e6fbd1351
comparison
equal deleted inserted replaced
20537:c49b886231d5 20538:90fd0826c6ce
67 67
68 if (g_list_find(purple_connections_get_all(), pa->gc) != NULL) 68 if (g_list_find(purple_connections_get_all(), pa->gc) != NULL)
69 { 69 {
70 MsnSession *session = pa->gc->proto_data; 70 MsnSession *session = pa->gc->proto_data;
71 MsnUserList *userlist = session->userlist; 71 MsnUserList *userlist = session->userlist;
72 MsnCallbackState *state = msn_callback_state_new(); 72 MsnCallbackState *state = msn_callback_state_new(session);
73 73
74 msn_callback_state_set_action(state, MSN_DENIED_BUDDY); 74 msn_callback_state_set_action(state, MSN_DENIED_BUDDY);
75 75
76 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL); 76 msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_BL);
77 msn_del_contact_from_list(session->contact, state, pa->who, MSN_LIST_PL); 77 msn_del_contact_from_list(session->contact, state, pa->who, MSN_LIST_PL);
653 g_return_if_fail(userlist->session != NULL); 653 g_return_if_fail(userlist->session != NULL);
654 654
655 655
656 purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name); 656 purple_debug_info("MSN Userlist", "Add user: %s to group: %s\n", who, new_group_name);
657 657
658 state = msn_callback_state_new(); 658 state = msn_callback_state_new(userlist->session);
659 msn_callback_state_set_who(state, who); 659 msn_callback_state_set_who(state, who);
660 msn_callback_state_set_new_group_name(state, new_group_name); 660 msn_callback_state_set_new_group_name(state, new_group_name);
661 661
662 if (!purple_email_is_valid(who)) 662 if (!purple_email_is_valid(who))
663 { 663 {
814 814
815 g_return_if_fail(userlist != NULL); 815 g_return_if_fail(userlist != NULL);
816 g_return_if_fail(userlist->session != NULL); 816 g_return_if_fail(userlist->session != NULL);
817 g_return_if_fail(userlist->session->contact != NULL); 817 g_return_if_fail(userlist->session->contact != NULL);
818 818
819 state = msn_callback_state_new(); 819 state = msn_callback_state_new(userlist->session);
820 msn_callback_state_set_who(state, who); 820 msn_callback_state_set_who(state, who);
821 msn_callback_state_set_action(state, MSN_MOVE_BUDDY); 821 msn_callback_state_set_action(state, MSN_MOVE_BUDDY);
822 msn_callback_state_set_old_group_name(state, old_group_name); 822 msn_callback_state_set_old_group_name(state, old_group_name);
823 msn_callback_state_set_new_group_name(state, new_group_name); 823 msn_callback_state_set_new_group_name(state, new_group_name);
824 824