1 files changed, 25 insertions, 25 deletions
diff --git a/Swift/Controllers/ChatControllerBase.cpp b/Swift/Controllers/ChatControllerBase.cpp
index baa715b..2b873f1 100644
--- a/Swift/Controllers/ChatControllerBase.cpp
+++ b/Swift/Controllers/ChatControllerBase.cpp
@@ -64,13 +64,13 @@ void ChatControllerBase::handleSendMessageRequest(const String &body) {
 	}
 	preSendMessageRequest(message);
 	stanzaChannel_->sendMessage(message);
 	postSendMessage(message->getBody());
 }
 
-void ChatControllerBase::handleSecurityLabelsCatalogResponse(boost::shared_ptr<SecurityLabelsCatalog> catalog, const boost::optional<Error>& error) {
+void ChatControllerBase::handleSecurityLabelsCatalogResponse(boost::shared_ptr<SecurityLabelsCatalog> catalog, const boost::optional<ErrorPayload>& error) {
 	if (!error) {
 		if (catalog->getLabels().size() == 0) {
 			chatWindow_->setSecurityLabelsEnabled(false);
 			labelsEnabled_ = false;
 		} else {
 			chatWindow_->setAvailableSecurityLabels(catalog->getLabels());
@@ -94,53 +94,53 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m
 	chatWindow_->setUnreadMessageCount(unreadMessages_.size());
 
 	boost::shared_ptr<Message> message = messageEvent->getStanza();
 	preHandleIncomingMessage(message);	
 	String body = message->getBody();
 	if (message->isError()) {
-		String errorMessage = getErrorMessage(message->getPayload<Error>());
+		String errorMessage = getErrorMessage(message->getPayload<ErrorPayload>());
 		chatWindow_->addErrorMessage(errorMessage);
 	}
 	else {
 		showChatWindow();
 		boost::shared_ptr<SecurityLabel> label = message->getPayload<SecurityLabel>();
 		boost::optional<SecurityLabel> maybeLabel = label ? boost::optional<SecurityLabel>(*label) : boost::optional<SecurityLabel>();
 		JID from = message->getFrom();
 		chatWindow_->addMessage(body, senderDisplayNameFromMessage(from), isIncomingMessageFromMe(message), maybeLabel, String(avatarManager_->getAvatarPath(from).string()));
 	}
 }
 
-String ChatControllerBase::getErrorMessage(boost::shared_ptr<Error> error) {
+String ChatControllerBase::getErrorMessage(boost::shared_ptr<ErrorPayload> error) {
 	String defaultMessage = "Error sending message";
 	if (!error->getText().isEmpty()) {
 		return error->getText();
 	}
 	else {
 		switch (error->getCondition()) {
-			case Error::BadRequest: return defaultMessage; break;
-			case Error::Conflict: return defaultMessage; break;
-			case Error::FeatureNotImplemented: return defaultMessage; break;
-			case Error::Forbidden: return defaultMessage; break;
-			case Error::Gone: return "Recipient can no longer be contacted"; break;
-			case Error::InternalServerError: return "Internal server error"; break;
-			case Error::ItemNotFound: return defaultMessage; break;
-			case Error::JIDMalformed: return defaultMessage; break;
-			case Error::NotAcceptable: return "Message was rejected"; break;
-			case Error::NotAllowed: return defaultMessage; break;
-			case Error::NotAuthorized: return defaultMessage; break;
-			case Error::PaymentRequired: return defaultMessage; break;
-			case Error::RecipientUnavailable: return "Recipient is unavailable."; break;
-			case Error::Redirect: return defaultMessage; break;
-			case Error::RegistrationRequired: return defaultMessage; break;
-			case Error::RemoteServerNotFound: return "Recipient's server not found."; break;
-			case Error::RemoteServerTimeout: return defaultMessage; break;
-			case Error::ResourceConstraint: return defaultMessage; break;
-			case Error::ServiceUnavailable: return defaultMessage; break;
-			case Error::SubscriptionRequired: return defaultMessage; break;
-			case Error::UndefinedCondition: return defaultMessage; break;
-			case Error::UnexpectedRequest: return defaultMessage; break;
+			case ErrorPayload::BadRequest: return defaultMessage; break;
+			case ErrorPayload::Conflict: return defaultMessage; break;
+			case ErrorPayload::FeatureNotImplemented: return defaultMessage; break;
+			case ErrorPayload::Forbidden: return defaultMessage; break;
+			case ErrorPayload::Gone: return "Recipient can no longer be contacted"; break;
+			case ErrorPayload::InternalServerError: return "Internal server error"; break;
+			case ErrorPayload::ItemNotFound: return defaultMessage; break;
+			case ErrorPayload::JIDMalformed: return defaultMessage; break;
+			case ErrorPayload::NotAcceptable: return "Message was rejected"; break;
+			case ErrorPayload::NotAllowed: return defaultMessage; break;
+			case ErrorPayload::NotAuthorized: return defaultMessage; break;
+			case ErrorPayload::PaymentRequired: return defaultMessage; break;
+			case ErrorPayload::RecipientUnavailable: return "Recipient is unavailable."; break;
+			case ErrorPayload::Redirect: return defaultMessage; break;
+			case ErrorPayload::RegistrationRequired: return defaultMessage; break;
+			case ErrorPayload::RemoteServerNotFound: return "Recipient's server not found."; break;
+			case ErrorPayload::RemoteServerTimeout: return defaultMessage; break;
+			case ErrorPayload::ResourceConstraint: return defaultMessage; break;
+			case ErrorPayload::ServiceUnavailable: return defaultMessage; break;
+			case ErrorPayload::SubscriptionRequired: return defaultMessage; break;
+			case ErrorPayload::UndefinedCondition: return defaultMessage; break;
+			case ErrorPayload::UnexpectedRequest: return defaultMessage; break;
 		}
 	}
 	return defaultMessage;
 }
 
 }