summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-09-12 16:21:36 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-09-12 21:39:01 (GMT)
commit3ae8cccfe9c6bfed5dda5f024a5cb046ccfc9793 (patch)
treecf58a21d66725dead1cda2d029b19b04d5f30e0c /Swift/Controllers
parent326c0620a103d621bcdd74341cd0117816acca03 (diff)
downloadswift-contrib-3ae8cccfe9c6bfed5dda5f024a5cb046ccfc9793.zip
swift-contrib-3ae8cccfe9c6bfed5dda5f024a5cb046ccfc9793.tar.bz2
Move Notifier to SwifTools
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/MainController.cpp2
-rw-r--r--Swift/Controllers/MainController.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index d4222e3..834dacd 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -83,6 +83,7 @@ MainController::MainController(
CapsStorage* capsStorage,
VCardStorageFactory* vcardStorageFactory,
Dock* dock,
+ Notifier* notifier,
bool useDelayForLatency) :
timerFactory_(&boostIOServiceThread_.getIOService()),
idleDetector_(&idleQuerier_, &timerFactory_, 100),
@@ -114,6 +115,7 @@ MainController::MainController(
mucSearchWindowFactory_ = mucSearchWindowFactory;
eventWindowFactory_ = eventWindowFactory;
dock_ = dock;
+ notifier_ = notifier;
chatListWindowFactory_ = chatListWindowFactory;
uiEventStream_ = new UIEventStream();
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 7aad4a0..7fbf54f 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -54,6 +54,7 @@ namespace Swift {
class SoftwareVersionResponder;
class LoginWindowFactory;
class MUCController;
+ class Notifier;
class PresenceOracle;
class SystemTray;
class SystemTrayController;
@@ -88,6 +89,7 @@ namespace Swift {
CapsStorage* capsStorage,
VCardStorageFactory* vcardStorageFactory,
Dock* dock,
+ Notifier* notifier,
bool useDelayForLatency);
~MainController();
@@ -134,6 +136,7 @@ namespace Swift {
VCardStorageFactory* vcardStorageFactory_;
VCardManager* vcardManager_;
Dock* dock_;
+ Notifier* notifier_;
ChatController* chatController_;
XMPPRosterController* xmppRosterController_;
RosterController* rosterController_;