Mercurial > pidgin
changeset 22682:8f4f88e03efb
merge of '946d948a1aa4270fa46dabca767e9d727d4519eb'
and '949fb9967a8d4bcae83af4ebc6b2681f26b17f5a'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 17 Apr 2008 07:09:46 +0000 |
| parents | a7ef2c82d125 (diff) dfb1cf26e0c8 (current diff) |
| children | 0723826f9229 a184ac4eace6 |
| files | |
| diffstat | 1 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/userlist.c Thu Apr 17 02:45:37 2008 +0000 +++ b/libpurple/protocols/msnp9/userlist.c Thu Apr 17 07:09:46 2008 +0000 @@ -362,6 +362,20 @@ passport = msn_user_get_passport(user); store = msn_user_get_friendly_name(user); + if (list_op & MSN_LIST_AL_OP) + { + /* These are users who are allowed to see our status. */ + purple_privacy_deny_remove(account, passport, TRUE); + purple_privacy_permit_add(account, passport, TRUE); + } + + if (list_op & MSN_LIST_BL_OP) + { + /* These are users who are not allowed to see our status. */ + purple_privacy_permit_remove(account, passport, TRUE); + purple_privacy_deny_add(account, passport, TRUE); + } + if (list_op & MSN_LIST_FL_OP) { GSList *c; @@ -377,20 +391,6 @@ serv_got_alias(gc, passport, store); } - if (list_op & MSN_LIST_AL_OP) - { - /* These are users who are allowed to see our status. */ - purple_privacy_deny_remove(account, passport, TRUE); - purple_privacy_permit_add(account, passport, TRUE); - } - - if (list_op & MSN_LIST_BL_OP) - { - /* These are users who are not allowed to see our status. */ - purple_privacy_permit_remove(account, passport, TRUE); - purple_privacy_deny_add(account, passport, TRUE); - } - if (list_op & MSN_LIST_RL_OP) { /* These are users who have us on their buddy list. */