Mercurial > pidgin.yaz

changeset 31214:432e3331f607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix logic error as pointed out by Elliot.
author masca@cpw.pidgin.im
date Sat, 05 Jun 2010 01:31:25 +0000
parents dbe448a9bfa1
children 23b7b1b817c8
files libpurple/protocols/msn/slpcall.c libpurple/protocols/msn/slplink.c
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/slpcall.c	Sat Jun 05 01:27:07 2010 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Sat Jun 05 01:31:25 2010 +0000
@@ -267,7 +267,7 @@
 		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);
--- a/libpurple/protocols/msn/slplink.c	Sat Jun 05 01:27:07 2010 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sat Jun 05 01:31:25 2010 +0000
@@ -331,7 +331,7 @@
 	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 @@
 	{
 		/* 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 @@
 		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 @@
 			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 @@
 	}
 
 	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 @@
 		}
 		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 */