summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Piekos <mateuszpiekos@gmail.com>2012-06-05 13:43:34 (GMT)
committerMateusz Piekos <mateuszpiekos@gmail.com>2012-06-05 13:43:34 (GMT)
commitdfeab948530982d10a7754a93a37cd8422888378 (patch)
tree68f437c9b100794fefb75f8cf143722e11f973cd /Swift/Controllers/Chat/ChatsManager.cpp
parent7520c7fed383d4f7631f5572ef40379022126264 (diff)
downloadswift-contrib-dfeab948530982d10a7754a93a37cd8422888378.zip
swift-contrib-dfeab948530982d10a7754a93a37cd8422888378.tar.bz2
Restored ChatController and ChatsManager
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index b9a5759..da96603 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -30,7 +30,6 @@
#include <Swiften/MUC/MUCManager.h>
#include <Swiften/Elements/ChatState.h>
#include <Swiften/Elements/MUCUserPayload.h>
-#include <Swiften/Elements/WhiteboardPayload.h>
#include <Swiften/Elements/DeliveryReceipt.h>
#include <Swiften/Elements/DeliveryReceiptRequest.h>
#include <Swiften/MUC/MUCBookmarkManager.h>
@@ -611,7 +610,7 @@ void ChatsManager::handleIncomingMessage(boost::shared_ptr<Message> message) {
if (isMediatedInvite) {
jid = (*message->getPayload<MUCUserPayload>()->getInvite()).from;
}
- if (!event->isReadable() && !message->getPayload<ChatState>() && !message->getPayload<DeliveryReceipt>() && !message->getPayload<DeliveryReceiptRequest>() && !isInvite && !isMediatedInvite && !message->hasSubject() && !message->getPayload<WhiteboardPayload>()) {
+ if (!event->isReadable() && !message->getPayload<ChatState>() && !message->getPayload<DeliveryReceipt>() && !message->getPayload<DeliveryReceiptRequest>() && !isInvite && !isMediatedInvite && !message->hasSubject()) {
return;
}