1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
index 3a32889..55537ff 100644
--- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp
+++ b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
@@ -44,62 +44,62 @@ void VCardUpdateAvatarManager::handlePresenceReceived(boost::shared_ptr<Presence
 	}
 }
 
 void VCardUpdateAvatarManager::handleVCardChanged(const JID& from, VCard::ref vCard) {
 	if (!vCard) {
 		SWIFT_LOG(debug) << "Missing element: " << from << ": null vcard payload" << std::endl;
 		return;
 	}
 
 	if (vCard->getPhoto().empty()) {
 		setAvatarHash(from, "");
 	}
 	else {
 		std::string hash = Hexify::hexify(crypto_->getSHA1Hash(vCard->getPhoto()));
 		if (!avatarStorage_->hasAvatar(hash)) {
 			avatarStorage_->addAvatar(hash, vCard->getPhoto());
 		}
 		setAvatarHash(from, hash);
 	}
 }
 
 void VCardUpdateAvatarManager::setAvatarHash(const JID& from, const std::string& hash) {
 	SWIFT_LOG(debug) << "Updating hash: " << from << " -> " << hash << std::endl;
 	avatarHashes_[from] = hash;
 	onAvatarChanged(from);
 }
 
 /*
 void VCardUpdateAvatarManager::setAvatar(const JID& jid, const ByteArray& avatar) {
 	std::string hash = Hexify::hexify(SHA1::getHash(avatar));
 	avatarStorage_->addAvatar(hash, avatar);
 	setAvatarHash(getAvatarJID(jid), hash);
 }
 */
 
-std::string VCardUpdateAvatarManager::getAvatarHash(const JID& jid) const {
+boost::optional<std::string> VCardUpdateAvatarManager::getAvatarHash(const JID& jid) const {
 	std::map<JID, std::string>::const_iterator i = avatarHashes_.find(getAvatarJID(jid));
 	if (i != avatarHashes_.end()) {
 		return i->second;
 	}
 	else {
-		return "";
+		return boost::optional<std::string>();
 	}
 }
 
 JID VCardUpdateAvatarManager::getAvatarJID(const JID& jid) const {
 	JID bareFrom = jid.toBare();
 	return (mucRegistry_ && mucRegistry_->isMUC(bareFrom)) ? jid : bareFrom;
 }
 
 void VCardUpdateAvatarManager::handleStanzaChannelAvailableChanged(bool available) {
 	if (available) {
 		std::map<JID, std::string> oldAvatarHashes;
 		avatarHashes_.swap(oldAvatarHashes);
 		for(std::map<JID, std::string>::const_iterator i = oldAvatarHashes.begin(); i != oldAvatarHashes.end(); ++i) {
 			onAvatarChanged(i->first);
 		}
 	}
 }
 
 
 }