Mercurial > pidgin
changeset 25959:f2bbf82ffb89
merge of '431618de0f30a6938f7e14d2d61ee5d7738acd59'
and 'e3608f6f07279daa718e5978b7c14a47ac57bce8'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 03 Mar 2009 05:13:52 +0000 |
| parents | 52fbda23e398 (current diff) c9f179cfffaa (diff) |
| children | f98049a447f2 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Mon Mar 02 16:34:05 2009 +0000 +++ b/libpurple/protocols/msn/notification.c Tue Mar 03 05:13:52 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);