soc.2010.msn-tlc: b4a877b5: Fix logic error as pointed out by Elliot...

[masca at cpw.pidgin.im]

-----------------------------------------------------------------
Revision: b4a877b5d355860851acfe7ac186ba5d4f88d684
Ancestor: 2f8e4a25bf8df945806e65e13670d90305bde2d5
Author: masca at cpw.pidgin.im
Date: 2010-06-05T01:31:25
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/b4a877b5d355860851acfe7ac186ba5d4f88d684

Modified files:
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c

ChangeLog: 

Fix logic error as pointed out by Elliot.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slpcall.c	f308a2d9feed89f26c74b54fac6178bc76352d18
+++ libpurple/protocols/msn/slpcall.c	ae9171dc5430cfec6771c62e7ba03c3d56cfe684
@@ -267,7 +267,7 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 		g_free(body_str);
 	}
 	else if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
-	         slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+	         slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 	         slpmsg->flags == P2P_FILE_DATA)
 	{
 		slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
============================================================
--- libpurple/protocols/msn/slplink.c	00100cc1f2425a41fc8081757b100e5c96e14eda
+++ libpurple/protocols/msn/slplink.c	b0c216542f5265a36cd6652b188d8c0ef9a17ac5
@@ -331,7 +331,7 @@ msn_slplink_send_msgpart(MsnSlpLink *slp
 	msn_slplink_send_msg(slplink, msg);
 
 	if ((slpmsg->flags == P2P_MSN_OBJ_DATA || 
-	     slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+	     slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 	     slpmsg->flags == P2P_FILE_DATA) &&
 		(slpmsg->slpcall != NULL))
 	{
@@ -377,7 +377,7 @@ msg_ack(MsnMessage *msg, void *data)
 	{
 		/* The whole message has been sent */
 		if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
-	        slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+	        slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 	        slpmsg->flags == P2P_FILE_DATA) 
 		{
 			if (slpmsg->slpcall != NULL)
@@ -427,7 +427,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
 		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
 	}
 	else if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
-	         slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+	         slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 	         slpmsg->flags == P2P_FILE_DATA)
 	{
 		MsnSlpCall *slpcall;
@@ -593,7 +593,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 			if (slpmsg->slpcall != NULL)
 			{
 				if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
-					slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+					slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 					slpmsg->flags == P2P_FILE_DATA)
 				{
 					PurpleXfer *xfer = slpmsg->slpcall->xfer;
@@ -659,7 +659,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 	}
 
 	if ((slpmsg->flags == P2P_MSN_OBJ_DATA ||
-		slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+		slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 		slpmsg->flags == P2P_FILE_DATA) &&
 		(slpmsg->slpcall != NULL))
 	{
@@ -703,7 +703,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 		}
 		else if (slpmsg->flags == P2P_NO_FLAG || slpmsg->flags == P2P_WML2009_COMP ||
 			slpmsg->flags == P2P_MSN_OBJ_DATA ||
-			slpmsg->flags == (P2P_WML2009_COMP & P2P_MSN_OBJ_DATA) ||
+			slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 			slpmsg->flags == P2P_FILE_DATA)
 		{
 			/* Release all the messages and send the ACK */