Mercurial > pidgin

comparison libpurple/protocols/msn/contact.c @ 28957:452043d200f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace guint membership_id[5] with guint member_id_on_pending_list in MsnUser. We were only using this value for MSN_LIST_PL, so don't bother storing it for other list types. Saves the size of 4 pointers per MSN buddy.
author Mark Doliner <mark@kingant.net>
date Wed, 03 Feb 2010 22:19:11 +0000
parents 23f6f80f45ed
children f7ba0e314fc8 cd022bd83677 767fd05c434d
comparison
equal deleted inserted replaced
28956:36dff94b1b53 28957:452043d200f0
404 node, passport, type, member_id == NULL ? "(null)" : member_id, nid); 404 node, passport, type, member_id == NULL ? "(null)" : member_id, nid);
405 405
406 msn_user_set_network(user, nid); 406 msn_user_set_network(user, nid);
407 msn_user_set_invite_message(user, invite); 407 msn_user_set_invite_message(user, invite);
408 408
409 if (member_id) { 409 if (list == MSN_LIST_PL && member_id) {
410 user->membership_id[list] = atoi(member_id); 410 user->member_id_on_pending_list = atoi(member_id);
411 } 411 }
412 412
413 msn_got_lst_user(session, user, 1 << list, NULL); 413 msn_got_lst_user(session, user, 1 << list, NULL);
414 414
415 g_free(passport); 415 g_free(passport);
1565 if (list == MSN_LIST_PL) { 1565 if (list == MSN_LIST_PL) {
1566 partner_scenario = MSN_PS_CONTACT_API; 1566 partner_scenario = MSN_PS_CONTACT_API;
1567 if (user && user->networkid != MSN_NETWORK_PASSPORT) 1567 if (user && user->networkid != MSN_NETWORK_PASSPORT)
1568 member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML, 1568 member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
1569 "EmailMember", "Email", 1569 "EmailMember", "Email",
1570 user->membership_id[MSN_LIST_PL]); 1570 user->member_id_on_pending_list);
1571 else 1571 else
1572 member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML, 1572 member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
1573 "PassportMember", "Passport", 1573 "PassportMember", "Passport",
1574 user->membership_id[MSN_LIST_PL]); 1574 user->member_id_on_pending_list);
1575 } else { 1575 } else {
1576 /* list == MSN_LIST_AL || list == MSN_LIST_BL */ 1576 /* list == MSN_LIST_AL || list == MSN_LIST_BL */
1577 partner_scenario = MSN_PS_BLOCK_UNBLOCK; 1577 partner_scenario = MSN_PS_BLOCK_UNBLOCK;
1578 if (user && user->networkid != MSN_NETWORK_PASSPORT) 1578 if (user && user->networkid != MSN_NETWORK_PASSPORT)
1579 member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML, 1579 member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,