summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-03 17:11:45 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-03 17:11:45 (GMT)
commit3dd69f2f852953638b220352b0eeee10464da5d8 (patch)
tree9edda54359e2624ef8221d8148213e0060811ead /Swiften/Controllers/MainController.cpp
parentbc41379bdb1ea19757914f45743ed97c999ce9e1 (diff)
downloadswift-3dd69f2f852953638b220352b0eeee10464da5d8.zip
swift-3dd69f2f852953638b220352b0eeee10464da5d8.tar.bz2
Pull requesting the roster out of the XMPPRosterController constructor.
Diffstat (limited to 'Swiften/Controllers/MainController.cpp')
-rw-r--r--Swiften/Controllers/MainController.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/Controllers/MainController.cpp b/Swiften/Controllers/MainController.cpp
index e0d0fe7..5535bf8 100644
--- a/Swiften/Controllers/MainController.cpp
+++ b/Swiften/Controllers/MainController.cpp
@@ -87,6 +87,7 @@ void MainController::handleConnected() {
delete xmppRosterController_;
xmppRosterController_ = new XMPPRosterController(client_, xmppRoster);
+ xmppRosterController_->requestRoster();
delete clientVersionResponder_;
clientVersionResponder_ = new SoftwareVersionResponder(CLIENT_NAME, CLIENT_VERSION, client_);
@@ -106,7 +107,7 @@ void MainController::handleConnected() {
//Send presence last to catch all the incoming presences.
boost::shared_ptr<Presence> initialPresence(new Presence());
- initialPresence->addPayload(capsInfo_);
+ initialPresence->addPayload(capsInfo_);
client_->sendPresence(initialPresence);
}