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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/msn
From:       Carlo Segato <brandon.ml () gmail ! com>
Date:       2008-02-16 17:55:52
Message-ID: 1203184552.544004.6564.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 775810 by segato:

Fix sending of msn contact picture


 M  +1 -16     outgoingtransfer.cpp  
 M  +1 -2      p2p.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/msn/outgoingtransfer.cpp #775809:775810
@@ -94,7 +94,7 @@
 {
 	qint32 bytesRead = 0;
 	QByteArray buffer;
-	buffer.reserve(1202);
+	buffer.resize(1202);
 
 	if(!m_file)
 		return;
@@ -130,21 +130,6 @@
 		}
 	}
 
-		if((m_offset + bytesRead) < m_file->size())
-		{
-			sendData(buffer);
-			m_offset += bytesRead;
-		}
-		else
-		{
-			m_isComplete = true;
-			// Send the last chunk of the file.
-			sendData(buffer);
-			m_offset += buffer.size();
-			// Close the file.
-			m_file->close();
-		}
-
 	if(m_transfer){
 		m_transfer->slotProcessed(m_offset);
 		if(m_isComplete){
--- trunk/KDE/kdenetwork/kopete/protocols/msn/p2p.cpp #775809:775810
@@ -199,8 +199,7 @@
 	outbound.header.ackUniqueIdentifier  = 0;
 	outbound.header.ackDataSize   = 0l;
 	QByteArray bytes;
-	bytes.reserve(4);
-	bytes.fill('\0');
+	bytes.fill('\0', 4);
 	outbound.body = bytes;
 	outbound.applicationIdentifier = 1;
 	outbound.destination = m_recipient;
[prev in list] [next in list] [prev in thread] [next in thread]