Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-07-23 15:51:40 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-07-23 15:51:40 (GMT) |
| commit | 72c2e69c3126c5baeaf983d74c2a18a0b07a409f (patch) | |
| tree | 6ffec34f96c963b6aac72ae63e63c3ddc96685c2 /Swift/Controllers | |
| parent | 4cc96003c6702168da2faa955e3c771272211e32 (diff) | |
| download | swift-72c2e69c3126c5baeaf983d74c2a18a0b07a409f.zip swift-72c2e69c3126c5baeaf983d74c2a18a0b07a409f.tar.bz2 | |
Don't create Notices for MUC history on join.
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 650a915..92ff7a9 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -18,6 +18,7 @@ #include "Swift/Controllers/UIEvents/UIEventStream.h" #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h" #include "Swiften/Avatars/AvatarManager.h" +#include "Swiften/Elements/Delay.h" #include "Swiften/MUC/MUC.h" #include "Swiften/Client/StanzaChannel.h" #include "Swiften/Roster/Roster.h" @@ -203,7 +204,7 @@ bool MUCController::messageTargetsMe(boost::shared_ptr<Message> message) { void MUCController::preHandleIncomingMessage(boost::shared_ptr<MessageEvent> messageEvent) { boost::shared_ptr<Message> message = messageEvent->getStanza(); - if (joined_ && messageTargetsMe(message)) { + if (joined_ && messageTargetsMe(message) && !message->getPayload<Delay>()) { eventController_->handleIncomingEvent(messageEvent); } String nick = message->getFrom().getResource(); |