Mercurial > pidgin
changeset 25954:c9f179cfffaa
Ignore the Forward List status bit when checking if user is on the Allow
and Block lists at the same time.
References #6702.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 03 Mar 2009 05:11:00 +0000 |
| parents | 33b8ac883b33 |
| children | f2bbf82ffb89 |
| files | libpurple/protocols/msn/notification.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Mon Mar 02 06:45:48 2009 +0000 +++ b/libpurple/protocols/msn/notification.c Tue Mar 03 05:11:00 2009 +0000 @@ -665,13 +665,14 @@ if (user->passport && !strcmp(user->passport, "messenger@microsoft.com")) continue; - if ((user->list_op & MSN_LIST_OP_MASK) == (MSN_LIST_AL_OP | MSN_LIST_BL_OP)) { + if ((user->list_op & MSN_LIST_OP_MASK & ~MSN_LIST_FL_OP) + == (MSN_LIST_AL_OP | MSN_LIST_BL_OP)) { /* The server will complain if we send it a user on both the Allow and Block lists. So assume they're on the Block list and remove them from the Allow list in the membership lists to stop this from happening again. */ purple_debug_warning("msn", - "User %s is on both Allow and Block list," + "User %s is on both Allow and Block list; " "removing from Allow list.\n", user->passport); msn_userlist_rem_buddy_from_list(session->userlist, user->passport, MSN_LIST_AL);