[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kopete/dev-0.12/kopete/protocols/msn
From:       Michaël Larouche <michael.larouche () kdemail ! net>
Date:       2005-12-31 22:22:11
Message-ID: 1136067731.023776.14464.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 492990 by mlarouche:

Temporary fix compilation of MSN plugin



 M  +62 -61    dispatcher.cpp  
 M  +1 -1      dispatcher.h  
 M  +2 -1      outgoingtransfer.cpp  
 M  +8 -4      p2p.cpp  
 M  +1 -1      p2p.h  


--- branches/work/kopete/dev-0.12/kopete/protocols/msn/dispatcher.cpp #492989:492990
@@ -212,67 +212,68 @@
 
 void Dispatcher::slotReadMessage(const QString &from, const QByteArray& stream)
 {
-	P2P::Message receivedMessage =
-		m_messageFormatter.readMessage(stream);
-
-	receivedMessage.source = from;
-
-	if(receivedMessage.contentType == "application/x-msnmsgrp2p")
-	{
-		if((receivedMessage.header.dataSize == 0)/* && ((receivedMessage.header.flag & 0x02) == 0x02)*/)
-		{
-			TransferContext *current = 0l;
-			QMap<Q_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
-			for(; it != m_sessions.end(); it++)
-			{
-				if(receivedMessage.header.ackSessionIdentifier == it.data()->m_identifier){
-					current = it.data();
-					break;
-				}
-			}
-
-			if(current){
-    			// Inform the transfer object of the acknowledge.
-    			current->m_ackSessionIdentifier = receivedMessage.header.identifier;
-    			current->m_ackUniqueIdentifier = receivedMessage.header.ackSessionIdentifier;
-				current->acknowledged();
-			}
-			else
-			{
-				kdDebug(14140) << k_funcinfo
-					<< "no transfer context with identifier, "
-					<< receivedMessage.header.ackSessionIdentifier
-					<< endl;
-			}
-			return;
-		}
-
-		if(m_messageBuffer.contains(receivedMessage.header.identifier))
-		{
-			kdDebug(14140) << k_funcinfo
-				<< QString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier)
-				<< endl;
-
-			// The message was split, try to reconstruct the message
-			// with this received piece.
-			Message bufferedMessage = m_messageBuffer[receivedMessage.header.identifier];
-			// Remove the buffered message.
-			m_messageBuffer.remove(receivedMessage.header.identifier);
-
-			bufferedMessage.body.resize(bufferedMessage.body.size() + receivedMessage.header.dataSize);
-			for(Q_UINT32 i=0; i < receivedMessage.header.dataSize; i++){
-				// Add the remaining message data to the buffered message.
-				bufferedMessage.body[receivedMessage.header.dataOffset + i] = receivedMessage.body[i];
-			}
-			bufferedMessage.header.dataSize += receivedMessage.header.dataSize;
-			bufferedMessage.header.dataOffset = 0;
-
-			receivedMessage = bufferedMessage;
-		}
-
-		// Dispatch the received message.
-		dispatch(receivedMessage);
-	}
+	// FIXME: Commented out to make compile -DarkShock
+// 	P2P::Message receivedMessage =
+// 		m_messageFormatter.readMessage(stream);
+// 
+// 	receivedMessage.source = from;
+// 
+// 	if(receivedMessage.contentType == "application/x-msnmsgrp2p")
+// 	{
+// 		if((receivedMessage.header.dataSize == 0)/* && ((receivedMessage.header.flag & 0x02) == 0x02)*/)
+// 		{
+// 			TransferContext *current = 0l;
+// 			QMap<Q_UINT32, TransferContext*>::Iterator it = m_sessions.begin();
+// 			for(; it != m_sessions.end(); it++)
+// 			{
+// 				if(receivedMessage.header.ackSessionIdentifier == it.data()->m_identifier){
+// 					current = it.data();
+// 					break;
+// 				}
+// 			}
+// 
+// 			if(current){
+//     			// Inform the transfer object of the acknowledge.
+//     			current->m_ackSessionIdentifier = receivedMessage.header.identifier;
+//     			current->m_ackUniqueIdentifier = receivedMessage.header.ackSessionIdentifier;
+// 				current->acknowledged();
+// 			}
+// 			else
+// 			{
+// 				kdDebug(14140) << k_funcinfo
+// 					<< "no transfer context with identifier, "
+// 					<< receivedMessage.header.ackSessionIdentifier
+// 					<< endl;
+// 			}
+// 			return;
+// 		}
+// 
+// 		if(m_messageBuffer.contains(receivedMessage.header.identifier))
+// 		{
+// 			kdDebug(14140) << k_funcinfo
+// 				<< QString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier)
+// 				<< endl;
+// 
+// 			// The message was split, try to reconstruct the message
+// 			// with this received piece.
+// 			Message bufferedMessage = m_messageBuffer[receivedMessage.header.identifier];
+// 			// Remove the buffered message.
+// 			m_messageBuffer.remove(receivedMessage.header.identifier);
+// 
+// 			bufferedMessage.body.resize(bufferedMessage.body.size() + receivedMessage.header.dataSize);
+// 			for(Q_UINT32 i=0; i < receivedMessage.header.dataSize; i++){
+// 				// Add the remaining message data to the buffered message.
+// 				bufferedMessage.body[receivedMessage.header.dataOffset + i] = receivedMessage.body[i];
+// 			}
+// 			bufferedMessage.header.dataSize += receivedMessage.header.dataSize;
+// 			bufferedMessage.header.dataOffset = 0;
+// 
+// 			receivedMessage = bufferedMessage;
+// 		}
+// 
+// 		// Dispatch the received message.
+// 		dispatch(receivedMessage);
+// 	}
 }
 
 void Dispatcher::dispatch(const P2P::Message& message)
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/dispatcher.h #492989:492990
@@ -91,7 +91,7 @@
 			void dispatch(const P2P::Message& message);
 			Kopete::Contact* getContactByAccountId(const QString& accountId);
 
-			P2P::MessageFormatter m_messageFormatter;
+			PeerToPeer::MessageFormatter m_messageFormatter;
 			QMap<Q_UINT32, P2P::TransferContext*> m_sessions;
 			QMap<Q_UINT32, P2P::Message> m_messageBuffer;
 			QString m_contact;
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/outgoingtransfer.cpp #492989:492990
@@ -380,7 +380,8 @@
 
 	QByteArray stream;
 	// Write the message to the memory stream.
-	m_messageFormatter.writeMessage(handshake, stream, true);
+	// FIXME: Disabled to fix compile -DarkShock
+	//m_messageFormatter.writeMessage(handshake, stream, true);
 	// Send the byte stream over the wire.
 	m_socket->writeBlock(stream.data(), stream.size());
 }
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/p2p.cpp #492989:492990
@@ -117,7 +117,8 @@
 
 	QByteArray stream;
 	// Write the acknowledge message to the stream.
-	m_messageFormatter.writeMessage(outbound, stream, (m_socket != 0l));
+	// FIXME: Disabled to fix compile -DarkShock
+	//m_messageFormatter.writeMessage(outbound, stream, (m_socket != 0l));
 	if(!m_socket)
 	{
 		// Send the acknowledge message.
@@ -167,7 +168,8 @@
 	outbound.destination = m_recipient;
 
 	QByteArray stream;
-	m_messageFormatter.writeMessage(outbound, stream, (m_socket != 0l));
+	// FIXME: Disabled to fix compile -DarkShock
+	//m_messageFormatter.writeMessage(outbound, stream, (m_socket != 0l));
 	if(!m_socket)
 	{
 		// Send the data message.
@@ -201,7 +203,8 @@
 	outbound.destination = m_recipient;
 
 	QByteArray stream;
-	m_messageFormatter.writeMessage(outbound, stream);
+	// FIXME: Disabled to fix compile -DarkShock
+	//m_messageFormatter.writeMessage(outbound, stream);
 	// Send the receiving client the data prepartion message.
  	m_dispatcher->callbackChannel()->send(stream);
 }
@@ -348,7 +351,8 @@
 
 		QByteArray stream;
 		// Write the outbound message to the stream.
-		m_messageFormatter.writeMessage(outbound, stream, (m_socket != 0l));
+		// FIXME: Disabled to fix compile -DarkShock
+		//m_messageFormatter.writeMessage(outbound, stream, (m_socket != 0l));
 		if(!m_socket)
 		{
 			// Send the outbound message.
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/p2p.h #492989:492990
@@ -135,7 +135,7 @@
 			bool m_isComplete;
 			Q_INT64 m_offset;
 			Q_INT64 m_totalDataSize;
-			P2P::MessageFormatter m_messageFormatter;
+			PeerToPeer::MessageFormatter m_messageFormatter;
 			QString m_recipient;
 			QString m_sender;
 			KNetwork::KBufferedSocket *m_socket;
[prev in list] [next in list] [prev in thread] [next in thread]