1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 9df2308..6c60783 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -386,13 +386,13 @@ void MainController::handleIncomingMessage(boost::shared_ptr<Message> message) {
 	// FIXME: This logic should go into a chat manager
 	if (event->isReadable()) {
 		getChatController(jid)->handleIncomingMessage(event);
 	}
 }
 
-void MainController::handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, const boost::optional<Error>& error) {
+void MainController::handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, const boost::optional<ErrorPayload>& error) {
 	if (!error) {
 		serverDiscoInfo_ = info;
 		foreach (JIDChatControllerPair pair, chatControllers_) {
 			pair.second->setAvailableServerFeatures(info);
 		}
 		foreach (JIDMUCControllerPair pair, mucControllers_) {
@@ -402,13 +402,13 @@ void MainController::handleServerDiscoInfoResponse(boost::shared_ptr<DiscoInfo>
 }
 
 bool MainController::isMUC(const JID& jid) const {
 	return mucControllers_.find(jid.toBare()) != mucControllers_.end();
 }
 
-void MainController::handleOwnVCardReceived(boost::shared_ptr<VCard> vCard, const boost::optional<Error>& error) {
+void MainController::handleOwnVCardReceived(boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error) {
 	if (!error && !vCard->getPhoto().isEmpty()) {
 		vCardPhotoHash_ = SHA1::getHexHash(vCard->getPhoto());
 		if (lastSentPresence_) {
 			sendPresence(lastSentPresence_);
 		}
 		avatarManager_->setAvatar(jid_, vCard->getPhoto());