Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-02-09 20:22:04 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-02-09 20:22:04 (GMT) |
| commit | 24afb2e086b62719fec45a5eeb04a7ba24918220 (patch) | |
| tree | 27b7add095de97385d545bd083767dd31df800dd /Swift/Controllers/Chat/ChatControllerBase.cpp | |
| parent | 94b7aaf53c8b20e03c8081cce49cda14cd5c01da (diff) | |
| download | swift-contrib-24afb2e086b62719fec45a5eeb04a7ba24918220.zip swift-contrib-24afb2e086b62719fec45a5eeb04a7ba24918220.tar.bz2 | |
Fixes for mediated invites
Diffstat (limited to 'Swift/Controllers/Chat/ChatControllerBase.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index f8f30ff..db71397 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -241,53 +241,50 @@ std::string ChatControllerBase::getErrorMessage(boost::shared_ptr<ErrorPayload> switch (error->getCondition()) { case ErrorPayload::BadRequest: return QT_TRANSLATE_NOOP("", "Bad request"); break; case ErrorPayload::Conflict: return QT_TRANSLATE_NOOP("", "Conflict"); break; case ErrorPayload::FeatureNotImplemented: return QT_TRANSLATE_NOOP("", "This feature is not implemented"); break; case ErrorPayload::Forbidden: return QT_TRANSLATE_NOOP("", "Forbidden"); break; case ErrorPayload::Gone: return QT_TRANSLATE_NOOP("", "Recipient can no longer be contacted"); break; case ErrorPayload::InternalServerError: return QT_TRANSLATE_NOOP("", "Internal server error"); break; case ErrorPayload::ItemNotFound: return QT_TRANSLATE_NOOP("", "Item not found"); break; case ErrorPayload::JIDMalformed: return QT_TRANSLATE_NOOP("", "JID Malformed"); break; case ErrorPayload::NotAcceptable: return QT_TRANSLATE_NOOP("", "Message was rejected"); break; case ErrorPayload::NotAllowed: return QT_TRANSLATE_NOOP("", "Not allowed"); break; case ErrorPayload::NotAuthorized: return QT_TRANSLATE_NOOP("", "Not authorized"); break; case ErrorPayload::PaymentRequired: return QT_TRANSLATE_NOOP("", "Payment is required"); break; case ErrorPayload::RecipientUnavailable: return QT_TRANSLATE_NOOP("", "Recipient is unavailable"); break; case ErrorPayload::Redirect: return QT_TRANSLATE_NOOP("", "Redirect"); break; case ErrorPayload::RegistrationRequired: return QT_TRANSLATE_NOOP("", "Registration required"); break; case ErrorPayload::RemoteServerNotFound: return QT_TRANSLATE_NOOP("", "Recipient's server not found"); break; case ErrorPayload::RemoteServerTimeout: return QT_TRANSLATE_NOOP("", "Remote server timeout"); break; case ErrorPayload::ResourceConstraint: return QT_TRANSLATE_NOOP("", "The server is low on resources"); break; case ErrorPayload::ServiceUnavailable: return QT_TRANSLATE_NOOP("", "The service is unavailable"); break; case ErrorPayload::SubscriptionRequired: return QT_TRANSLATE_NOOP("", "A subscription is required"); break; case ErrorPayload::UndefinedCondition: return QT_TRANSLATE_NOOP("", "Undefined condition"); break; case ErrorPayload::UnexpectedRequest: return QT_TRANSLATE_NOOP("", "Unexpected request"); break; } } return defaultMessage; } void ChatControllerBase::handleMUCInvitation(Message::ref message) { MUCInvitationPayload::ref invite = message->getPayload<MUCInvitationPayload>(); chatWindow_->addMUCInvitation(invite->getJID(), invite->getReason(), invite->getPassword()); } void ChatControllerBase::handleMediatedMUCInvitation(Message::ref message) { MUCUserPayload::Invite invite = *message->getPayload<MUCUserPayload>()->getInvite(); - JID from; - if (invite.from.isValid()) { - from = invite.from; - } + JID from = message->getFrom(); std::string reason; if (!invite.reason.empty()) { reason = invite.reason; } std::string password; if (message->getPayload<MUCUserPayload>()->getPassword()) { password = *message->getPayload<MUCUserPayload>()->getPassword(); } chatWindow_->addMUCInvitation(from, reason, password, false); } } |