diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-03-14 19:11:05 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-03-14 19:11:05 (GMT) |
commit | aebf16650e33f442d3cc3bbc87f034c3c146e596 (patch) | |
tree | f023cf222f084388733679ef4392671db8a7c293 /Swiften/Avatars/CombinedAvatarProvider.cpp | |
parent | 90e773d9fb6ed8e80b502cc5d8f5763d94a41039 (diff) | |
download | swift-contrib-aebf16650e33f442d3cc3bbc87f034c3c146e596.zip swift-contrib-aebf16650e33f442d3cc3bbc87f034c3c146e596.tar.bz2 |
Make sure the avatar gets updated in the chat window.
Combined avatar provider shouldn't look up avatars in the cache, because
the specific providers can return different results if they use the bare
JID.
Resolves: #781
Release-Notes: Fixed a bug where the avatar was not updating in the chat window.
Diffstat (limited to 'Swiften/Avatars/CombinedAvatarProvider.cpp')
-rw-r--r-- | Swiften/Avatars/CombinedAvatarProvider.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Swiften/Avatars/CombinedAvatarProvider.cpp b/Swiften/Avatars/CombinedAvatarProvider.cpp index d7e716c..eea0b89 100644 --- a/Swiften/Avatars/CombinedAvatarProvider.cpp +++ b/Swiften/Avatars/CombinedAvatarProvider.cpp @@ -14,13 +14,7 @@ namespace Swift { std::string CombinedAvatarProvider::getAvatarHash(const JID& jid) const { - std::map<JID, std::string>::const_iterator i = avatars.find(jid); - if (i == avatars.end()) { - return getCombinedAvatarAndCache(jid); - } - else { - return i->second; - } + return getCombinedAvatarAndCache(jid); } void CombinedAvatarProvider::addProvider(AvatarProvider* provider) { |