pidgin: e3608f6f: Ignore the Forward List status bit when ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: e3608f6f07279daa718e5978b7c14a47ac57bce8
Ancestor: 1993b422293391acec97ee8619b0cf9d67f25ca6
Author: qulogic at pidgin.im
Date: 2009-03-03T05:11:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e3608f6f07279daa718e5978b7c14a47ac57bce8

Modified files:
        libpurple/protocols/msn/notification.c

ChangeLog: 

Ignore the Forward List status bit when checking if user is on the Allow
and Block lists at the same time.

References #6702.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/notification.c	f1b1dca6bfb4d81532fa3650b37be4110df66c2f
+++ libpurple/protocols/msn/notification.c	ddf4aeff8d134fe0dffa2d51caf7cecb100a2841
@@ -665,13 +665,14 @@ msn_notification_dump_contact(MsnSession
 		if (user->passport && !strcmp(user->passport, "messenger at 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);