kopete: Remove the AIM specific code from liboscar

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 036b0229dba794cf6267b522ac1f6449b6708d51)

1 files changed, 7 insertions, 26 deletions

diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
index 5f4146e3..af180be1 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
@@ -98,22 +98,11 @@ void SendMessageTask::onGo()
 			break;
 		}
 
-		// Add the TLV to indicate if this is an autoresponse: 0x00040000
-		// Right now, only supported for the AIM client, I'm not sure about ICQ
-		// For some reason you can't have both a 0x0004 and 0x0003 TLV in the same
-		// SNAC, if you do the AIM server complains
-		if ( !client()->isIcq() && (m_autoResponse == true) )
-		{
-			TLV tlv4( 0x0004, 0, NULL);
-			b->addTLV( tlv4 );
-		}
-		else
-		{
-			b->addDWord( 0x00030000 ); //empty TLV 3 to get an ack from the server
-		}
+		b->addDWord( 0x00030000 ); //empty TLV 3 to get an ack from the server
 
-		if ( client()->isIcq() && m_message.type() != 2 && ! m_message.hasProperty( Oscar::Message::StatusMessageRequest ) )
+		if ( m_message.type() != 2 && ! m_message.hasProperty( Oscar::Message::StatusMessageRequest ) ) {
 			b->addDWord( 0x00060000 ); //empty TLV 6 to store message on the server if not online
+		}
 	}
 	else
 	{
@@ -141,18 +130,10 @@ void SendMessageTask::addChannel1Data( Buffer* b )
 {
 	Buffer tlv2buffer;
 
-	//Send features TLV using data from pidgin. Features are different
-	//depending on whether we're ICQ or AIM
-	if ( client()->isIcq() )
-	{
-		tlv2buffer.addDWord( 0x05010002 ); //TLV 0x0501, length 2
-		tlv2buffer.addWord( 0x0106 ); //TLV 0x0501 data
-	}
-	else
-	{
-		tlv2buffer.addDWord( 0x05010004 ); //TLV 0x0501, length 4
-		tlv2buffer.addDWord( 0x01010102 ); //TLV 0x0501 data.
-	}
+	//Send features TLV using data from pidgin.
+	tlv2buffer.addDWord( 0x05010002 ); //TLV 0x0501, length 2
+	tlv2buffer.addWord( 0x0106 ); //TLV 0x0501 data
+
 	//we only send one message part. There's only one client that actually uses
 	//them and it's quite old and infrequently used
 	tlv2buffer.addWord( 0x0101 ); //add TLV(0x0101) also known as TLV(257)