From kde-commits  Wed Apr 20 09:21:25 2005
From: Olivier Goffart <ogoffart () kde ! org>
Date: Wed, 20 Apr 2005 09:21:25 +0000
To: kde-commits
Subject: kdenetwork/kopete/protocols/msn
Message-Id: <20050420092125.64CD2653 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111398889619236

CVS commit by ogoffart: 

MSN file transfer over the msn server is working Kopete -> Kopete ,  but not yet Kopete -> MSN Messenger.
Still disabled


  M +4 -4      msnp2pdisplatcher.cpp   1.5
  M +5 -1      msnp2poutgoing.cpp   1.3


--- kdenetwork/kopete/protocols/msn/msnp2pdisplatcher.cpp  #1.4:1.5
@@ -47,5 +47,5 @@
 static QString randomid()
 {
-        return QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)
+        return (QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)
                         + QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16) + "-"
                         + QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16) + "-"
@@ -54,5 +54,5 @@ static QString randomid()
                         + QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)
                         + QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)
-                        + QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16);
+                        + QString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)).upper();
 }
 
@@ -585,6 +585,6 @@ void MSNP2PDisplatcher::sendFile(const Q
         if(!codec)
                 return; //abort();
-        int taille;;
-        QCString utf16FileName=codec->fromUnicode(fileN /*.right( fileN.length() - fileN.findRev( '/' ) - 1 )*/ , taille );
+        int taille;
+        QCString utf16FileName=codec->fromUnicode(fileN.right( fileN.length() - fileN.findRev( '/' ) - 1 ) , taille );
 
         

--- kdenetwork/kopete/protocols/msn/msnp2poutgoing.cpp  #1.2:1.3
@@ -60,5 +60,9 @@ void MSNP2POutgoing::parseMessage(Messag
                 { //first OK
                         //send second invite
-                        QString content="TODO\r\n\r\n"; //TODO  (this will work kopete -> kopete, but that's all)
+                        QString content="Bridges: TCPv1\r\n"
+                                        "NetID: 0\r\n"
+                                        "Conn-Type: Restricted-NAT\r\n"
+                                        "UPnPNat: false\r\n"
+                                        "ICF: false\r\n\r\n"; 
                         makeMSNSLPMessage( INVITE , content );
                 }