Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-07-23 11:19:20 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-07-23 11:19:20 (GMT) |
| commit | 3b8a09263c836a4cd397b606edbb023b19cf46b5 (patch) | |
| tree | ee1be43c2232b960292ed1eb725772823b3a4869 /Swift/Controllers/Chat/ChatsManager.cpp | |
| parent | 913255f08de43f2ede74143f2d71c1e3a7cf5717 (diff) | |
| download | swift-3b8a09263c836a4cd397b606edbb023b19cf46b5.zip swift-3b8a09263c836a4cd397b606edbb023b19cf46b5.tar.bz2 | |
Generate a Notice if your nick is mentioned in a MUC.
Resolves: #471
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index ea38f1f..2ed7051 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -168,7 +168,7 @@ ChatController* ChatsManager::getChatControllerOrFindAnother(const JID &contact) } ChatController* ChatsManager::createNewChatController(const JID& contact) { - ChatController* controller = new ChatController(jid_, stanzaChannel_, iqRouter_, chatWindowFactory_, contact, nickResolver_, presenceOracle_, avatarManager_, isMUC(contact.toBare()), useDelayForLatency_, uiEventStream_); + ChatController* controller = new ChatController(jid_, stanzaChannel_, iqRouter_, chatWindowFactory_, contact, nickResolver_, presenceOracle_, avatarManager_, isMUC(contact.toBare()), useDelayForLatency_, uiEventStream_, eventController_); chatControllers_[contact] = controller; controller->setAvailableServerFeatures(serverDiscoInfo_); return controller; @@ -204,7 +204,7 @@ void ChatsManager::handleJoinMUCRequest(const JID &muc, const boost::optional<St //FIXME: What's correct behaviour here? } else { String nick = nickMaybe ? nickMaybe.get() : "Swift user"; - MUCController* controller = new MUCController(jid_, muc, nick, stanzaChannel_, presenceSender_, iqRouter_, chatWindowFactory_, presenceOracle_, avatarManager_, uiEventStream_, false, timerFactory_); + MUCController* controller = new MUCController(jid_, muc, nick, stanzaChannel_, presenceSender_, iqRouter_, chatWindowFactory_, presenceOracle_, avatarManager_, uiEventStream_, false, timerFactory_, eventController_); mucControllers_[muc] = controller; controller->setAvailableServerFeatures(serverDiscoInfo_); controller->onUserLeft.connect(boost::bind(&ChatsManager::handleUserLeftMUC, this, controller)); @@ -233,7 +233,6 @@ void ChatsManager::handleIncomingMessage(boost::shared_ptr<Message> message) { } //if not a mucroom - eventController_->handleIncomingEvent(event); getChatControllerOrCreate(jid)->handleIncomingMessage(event); } |