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

List:       kde-commits
Subject:    branches/KDE/3.5/kdenetwork/kopete/protocols/msn
From:       Matt Rogers <mattr () kde ! org>
Date:       2007-08-24 19:21:00
Message-ID: 1187983260.368028.20366.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 704382 by mattr:

fix msn live emoticons. Patch from Flavio. Thanks!

CCMAIL: flavio@flavioweb.it



 M  +1 -1      dispatcher.cpp  
 M  +2 -2      msnswitchboardsocket.cpp  


--- branches/KDE/3.5/kdenetwork/kopete/protocols/msn/dispatcher.cpp #704381:704382
@@ -382,7 +382,7 @@
 			regex.search(body);
 			Q_UINT32 applicationId = regex.cap(1).toUInt();
 
-			if(applicationId == 1  || applicationId == 12)
+			if(applicationId == 1  || applicationId == 11 || applicationId == 12 )
 			{                         //the AppID is 12 since Messenger 7.5
 				// A contact has requested a session to download
 				// a display icon (User Display Icon or CustomEmotion).
--- branches/KDE/3.5/kdenetwork/kopete/protocols/msn/msnswitchboardsocket.cpp \
#704381:704382 @@ -631,9 +631,9 @@
 
 			QString sha1d = QString(KCodecs::base64Encode(SHA1::hash(ar)));
 			QString size = QString::number( pictFile.size() );
-			QString all = "Creator" + m_account->accountId() +	"Size" + size + \
"Type3Location" + fi.fileName() + "FriendlyAAA=SHA1D" + sha1d; +			QString all = \
"Creator" + m_account->accountId() +	"Size" + size + "Type2Location" + fi.fileName() \
+ "FriendlyAAA=SHA1D" + sha1d;  QString sha1c = \
                QString(KCodecs::base64Encode(SHA1::hashString(all.utf8())));
-			picObj = "<msnobj Creator=\"" + m_account->accountId() + "\" Size=\"" + size  + \
"\" Type=\"3\" Location=\""+ fi.fileName() + "\" Friendly=\"AAA=\" SHA1D=\""+sha1d+ \
"\" SHA1C=\""+sha1c+"\"/>"; +			picObj = "<msnobj Creator=\"" + \
m_account->accountId() + "\" Size=\"" + size  + "\" Type=\"2\" Location=\""+ \
fi.fileName() + "\" Friendly=\"AAA=\" SHA1D=\""+sha1d+ "\" SHA1C=\""+sha1c+"\"/>";  
 			PeerDispatcher()->objectList.insert(picObj, filename);
 		}


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