Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-08-27 11:58:06 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-08-27 11:58:06 (GMT) |
| commit | 0571ecb72660dbdbe06d524eb62e5398dca45586 (patch) | |
| tree | f3d525ea5450f49c1e06c407f1d7607aad6590a9 /Swift/Controllers/MainController.cpp | |
| parent | 7ff89853f825f0601ac4ec2adfca19edd7863edf (diff) | |
| download | swift-0571ecb72660dbdbe06d524eb62e5398dca45586.zip swift-0571ecb72660dbdbe06d524eb62e5398dca45586.tar.bz2 | |
Use own nick at top of roster.
Currently doesn't work because onOwnVCardChanged isn't plumbed in.
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 1032de1..f4d67f6 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -221,18 +221,18 @@ void MainController::handleConnected() { loginWindow_->setIsLoggingIn(false); resetCurrentError(); resetPendingReconnects(); - //FIXME: this freshLogin thing is temporary so I can see what's what before I split into a seperate method. bool freshLogin = rosterController_ == NULL; if (freshLogin) { serverDiscoInfo_ = boost::shared_ptr<DiscoInfo>(new DiscoInfo()); xmppRoster_ = boost::shared_ptr<XMPPRoster>(new XMPPRoster()); presenceOracle_ = new PresenceOracle(client_); - nickResolver_ = new NickResolver(xmppRoster_); vcardManager_ = new VCardManager(jid_, client_, getVCardStorageForProfile(jid_)); vcardManager_->onOwnVCardChanged.connect(boost::bind(&MainController::handleOwnVCardReceived, this, _1)); avatarManager_ = new AvatarManager(vcardManager_, client_, avatarStorage_); + nickResolver_ = new NickResolver(this->jid_.toBare(), xmppRoster_, vcardManager_); + rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, nickResolver_, presenceOracle_, eventController_, uiEventStream_, client_); rosterController_->onChangeStatusRequest.connect(boost::bind(&MainController::handleChangeStatusRequest, this, _1, _2)); rosterController_->onSignOutRequest.connect(boost::bind(&MainController::signOut, this)); |