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 +#include #include 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 ); }