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

List:       kopete-devel
Subject:    Re: [kopete-devel] Msn live emoticons problem: possible solution.
From:       Flavio <flavio () flavioweb ! it>
Date:       2007-08-22 9:58:41
Message-ID: 1187776721.4283.0.camel () flavioweb-linux ! site
[Download RAW message or body]

Here is the diff file...

Il giorno mer, 22/08/2007 alle 11.50 +0200, Martijn Klingens ha scritto:
> On Tuesday 21 August 2007 20:25, Flavio wrote:
> > I just tested it with msn 8.5 BETA (Build 8.5.1235.0517).
> >
> > All works fine.
> 
> Can you send the diff to this mailing list for review and inclusion?
> 
> Type:
> 
>      svn diff > msn.diff
> 
> 
> And you get a file msn.diff that you can attach to the mail.
> 
> Thanks!
> 

["msn.diff" (msn.diff)]

Index: kopete/protocols/msn/dispatcher.cpp
===================================================================
--- kopete/protocols/msn/dispatcher.cpp	(revisione 702629)
+++ kopete/protocols/msn/dispatcher.cpp	(copia locale)
@@ -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).
Index: kopete/protocols/msn/msnswitchboardsocket.cpp
===================================================================
--- kopete/protocols/msn/msnswitchboardsocket.cpp	(revisione 702629)
+++ kopete/protocols/msn/msnswitchboardsocket.cpp	(copia locale)
@@ -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);
 		}



_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel


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