Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-05-21 20:45:42 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-05-21 20:45:42 (GMT) |
| commit | c9659b556b932e2f887cf1d8ab6c5a0bead835eb (patch) | |
| tree | 41543cbb50580f0dd94a7dd5902e76747859c7e9 /Swift/Controllers/MainController.cpp | |
| parent | dc80d6baf01d1a4c69e5204887d430ad5f6daaec (diff) | |
| download | swift-c9659b556b932e2f887cf1d8ab6c5a0bead835eb.zip swift-c9659b556b932e2f887cf1d8ab6c5a0bead835eb.tar.bz2 | |
Warnings about MUC joins that never complete.
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 13426eb..6c9c5dd 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -13,6 +13,8 @@ #include "Swiften/Application/Application.h" #include "Swiften/Application/ApplicationMessageDisplay.h" +#include "Swiften/Network/TimerFactory.h" +#include "Swiften/Network/BoostTimerFactory.h" #include "Swift/Controllers/Chat/ChatController.h" #include "Swift/Controllers/Chat/MUCSearchController.h" //#include "Swift/Controllers/UIInterfaces/ChatWindowFactory.h" @@ -183,7 +185,7 @@ void MainController::handleConnected() { rosterController_->onChangeStatusRequest.connect(boost::bind(&MainController::handleChangeStatusRequest, this, _1, _2)); rosterController_->onSignOutRequest.connect(boost::bind(&MainController::signOut, this)); - chatsManager_ = new ChatsManager(jid_, client_, client_, eventController_, chatWindowFactory_, nickResolver_, presenceOracle_, serverDiscoInfo_, presenceSender_, uiEventStream_, chatListWindowFactory_, useDelayForLatency_); + chatsManager_ = new ChatsManager(jid_, client_, client_, eventController_, chatWindowFactory_, nickResolver_, presenceOracle_, serverDiscoInfo_, presenceSender_, uiEventStream_, chatListWindowFactory_, useDelayForLatency_, &timerFactory_); nickResolver_->setMUCRegistry(chatsManager_); client_->onMessageReceived.connect(boost::bind(&ChatsManager::handleIncomingMessage, chatsManager_, _1)); chatsManager_->setAvatarManager(avatarManager_); |