From kde-commits  Wed May 20 21:46:59 2009
From: Duncan Mac-Vicar Prett <duncan () kde ! org>
Date: Wed, 20 May 2009 21:46:59 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/libkopete
Message-Id: <1242856019.503884.28791.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124285605115222

SVN commit 970823 by dmacvicar:


use the protocol name in the avatar path too, otherwise stuff like
googletalk can clash with a msn account using gmail as passport.



 M  +4 -0      kopeteavatarmanager.cpp  


--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteavatarmanager.cpp #970822:970823
@@ -39,6 +39,7 @@
 
 // Kopete includes
 #include <kopetecontact.h>
+#include <kopeteprotocol.h>
 #include <kopeteaccount.h>
 
 namespace Kopete
@@ -114,6 +115,9 @@
 			if( newEntry.contact && newEntry.contact->account() )
 			{
 				QString accountName = newEntry.contact->account()->accountId();
+				QString protocolName = newEntry.contact->account()->protocol()->pluginId();                                
+				avatarUrl.addPath( protocolName );
+				d->createDirectory( avatarUrl );
 				avatarUrl.addPath( accountName );
 				d->createDirectory( avatarUrl );
 			}