# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1236057232 0
# Node ID f2bbf82ffb89e53944a5a3ca4c24a72df3e0289f
# Parent  52fbda23e39849da3035bf40910ff690f4e4d8fa# Parent  c9f179cfffaa58cf66bb7b4c3951396659bb9633
merge of '431618de0f30a6938f7e14d2d61ee5d7738acd59'
     and 'e3608f6f07279daa718e5978b7c14a47ac57bce8'

diff -r 52fbda23e398 -r f2bbf82ffb89 libpurple/protocols/msn/notification.c
--- 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);