summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-08-28 14:44:32 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-08-28 14:44:32 (GMT)
commit5dc7d1459b966ba5b848760bc43cbb1242d5da80 (patch)
tree140c78dc162b79f0f01bb6358d8d645f16e9df98 /Swift
parentd5a0dcb28c5738660ee56483ad305a0075f71799 (diff)
parenteba9a50f10082430c38b849b6af95f92f3de6ef8 (diff)
downloadswift-5dc7d1459b966ba5b848760bc43cbb1242d5da80.zip
swift-5dc7d1459b966ba5b848760bc43cbb1242d5da80.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Keep VCard photo hash cache consistent. Fix assertion on inconsistent VCard photohash cache. Conflicts: Swift/Controllers/Storages/VCardFileStorage.cpp Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/Storages/VCardFileStorage.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index 3dff06f..d799a90 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -52,7 +52,9 @@ VCardFileStorage::VCardFileStorage(boost::filesystem::path dir) : vcardsPath(dir
}
boost::shared_ptr<VCard> VCardFileStorage::getVCard(const JID& jid) const {
- return VCardPersister().loadPayloadGeneric(getVCardPath(jid));
+ boost::shared_ptr<VCard> result = VCardPersister().loadPayloadGeneric(getVCardPath(jid));
+ getAndUpdatePhotoHash(jid, result);
+ return result;
}
void VCardFileStorage::setVCard(const JID& jid, VCard::ref v) {