Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-09-15 19:46:15 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-09-15 19:46:15 (GMT) |
| commit | d0367c8477ad2e9993ed5ea6acb2444f21f8f971 (patch) | |
| tree | a528dd7725271179e8245ef3875e03aedde23738 /Swift/Controllers/MainController.cpp | |
| parent | 8e5d1a11824d7a0900feb44ed5b5464d8d94ab2a (diff) | |
| download | swift-d0367c8477ad2e9993ed5ea6acb2444f21f8f971.zip swift-d0367c8477ad2e9993ed5ea6acb2444f21f8f971.tar.bz2 | |
Added EventNotifier.
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index f7f2155..11001b3 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -38,6 +38,7 @@ #include "Swiften/Roster/XMPPRosterController.h" #include "Swift/Controllers/UIEvents/UIEventStream.h" #include "Swift/Controllers/PresenceNotifier.h" +#include "Swift/Controllers/EventNotifier.h" #include "SwifTools/Dock/Dock.h" #include "Swiften/Base/foreach.h" #include "Swiften/Base/String.h" @@ -107,6 +108,7 @@ MainController::MainController( capsManager_ = NULL; entityCapsManager_ = NULL; presenceNotifier_ = NULL; + eventNotifier_ = NULL; nickResolver_ = NULL; rosterController_ = NULL; xmppRosterController_ = NULL; @@ -197,6 +199,8 @@ void MainController::resetClient() { chatsManager_ = NULL; delete rosterController_; rosterController_ = NULL; + delete eventNotifier_; + eventNotifier_ = NULL; delete presenceNotifier_; presenceNotifier_ = NULL; delete entityCapsManager_; @@ -394,6 +398,8 @@ void MainController::performLoginFromCachedCredentials() { entityCapsManager_ = new EntityCapsManager(capsManager_, client_); presenceNotifier_ = new PresenceNotifier(client_, notifier_, mucRegistry_, avatarManager_, nickResolver_, presenceOracle_, &timerFactory_); presenceNotifier_->onNotificationActivated.connect(boost::bind(&MainController::handleNotificationClicked, this, _1)); + eventNotifier_ = new EventNotifier(eventController_, notifier_, avatarManager_, nickResolver_); + eventNotifier_->onNotificationActivated.connect(boost::bind(&MainController::handleNotificationClicked, this, _1)); client_->onDataRead.connect(boost::bind( &XMLConsoleController::handleDataRead, xmlConsoleController_, _1)); client_->onDataWritten.connect(boost::bind( |