pidgin: a0f1fbdb: Fix the name of this flag.

qulogic at pidgin.im qulogic at pidgin.im
Sun Nov 28 03:25:10 EST 2010


----------------------------------------------------------------------
Revision: a0f1fbdb08e486622f76673697309a68ceb998fb
Parent:   3a43fb06bb25d5b2835f6a1f60e9543396b4c457
Author:   qulogic at pidgin.im
Date:     11/27/10 21:15:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a0f1fbdb08e486622f76673697309a68ceb998fb

Changelog: 

Fix the name of this flag.

Changes against parent 3a43fb06bb25d5b2835f6a1f60e9543396b4c457

  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slplink.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slpcall.c	e2fd60e824da0f700d0c0deef15f3848b7ccaad1
+++ libpurple/protocols/msn/slpcall.c	7f7e68b86f1e0b4021722c8991f8710f28a8e951
@@ -1061,7 +1061,7 @@ msn_slp_process_msg(MsnSlpLink *slplink,
 	body = slpmsg->buffer;
 	body_len = slpmsg->header->offset;
 
-	if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP)
+	if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WLM2009_COMP)
 	{
 		char *body_str;
 
============================================================
--- libpurple/protocols/msn/slplink.c	3c215c846803cab473e23a5b8956fd86611fb496
+++ libpurple/protocols/msn/slplink.c	5558091cf2125449aab49fabe4760e48454b3128
@@ -518,7 +518,7 @@ process_complete_msg(MsnSlpLink *slplink
 			msn_directconn_send_handshake(directconn);
 #endif
 	}
-	else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP ||
+	else if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WLM2009_COMP ||
 			msn_p2p_msg_is_data(slpmsg->header->flags))
 	{
 		/* Release all the messages and send the ACK */
============================================================
--- libpurple/protocols/msn/p2p.h	ec243759e2e2fd0b873d6b6e8cc158d88963b8a0
+++ libpurple/protocols/msn/p2p.h	32d9aa05d7b1837e535ae3240efc6d7375501fb6
@@ -73,7 +73,7 @@ typedef enum
 	P2P_CLOSE           = 0x40,       /**< Close session */
 	P2P_TLP_ERROR       = 0x80,       /**< Error at transport layer protocol */
 	P2P_DC_HANDSHAKE    = 0x100,      /**< Direct Handshake */
-	P2P_WML2009_COMP    = 0x1000000,  /**< Compatibility with WLM 2009 */
+	P2P_WLM2009_COMP    = 0x1000000,  /**< Compatibility with WLM 2009 */
 	P2P_FILE_DATA       = 0x1000030   /**< File transfer data */
 } MsnP2PHeaderFlag;
 /* Info From:
============================================================
--- libpurple/protocols/msn/p2p.c	53eb22e3ba09b95eb54f2ac3f7803439a034cb34
+++ libpurple/protocols/msn/p2p.c	c4b5571a0103df63796951b1850ba67c7a8f0027
@@ -95,6 +95,6 @@ msn_p2p_msg_is_data(const MsnP2PHeaderFl
 msn_p2p_msg_is_data(const MsnP2PHeaderFlag flags)
 {
 	return (flags == P2P_MSN_OBJ_DATA ||
-	        flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
+	        flags == (P2P_WLM2009_COMP | P2P_MSN_OBJ_DATA) ||
 	        flags == P2P_FILE_DATA);
 }


More information about the Commits mailing list