summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-08-27 18:58:01 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-08-27 18:58:01 (GMT)
commitba774f85e77531c7971804cb738c6b434a197258 (patch)
treeeed0887a9494256b5271e14045cfb537737bcd00 /Swift/Controllers/MainController.cpp
parentdd9e8b6bb212128c0e5c82a7cf80e2f49597bc31 (diff)
downloadswift-ba774f85e77531c7971804cb738c6b434a197258.zip
swift-ba774f85e77531c7971804cb738c6b434a197258.tar.bz2
Rerequest the roster at reconnect.
Resolves: #548
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
-rw-r--r--Swift/Controllers/MainController.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 7cd4304..b94022e 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -247,7 +247,6 @@ void MainController::handleConnected() {
avatarManager_->setMUCRegistry(chatsManager_);
xmppRosterController_ = new XMPPRosterController(client_, xmppRoster_);
- xmppRosterController_->requestRoster();
eventWindowController_ = new EventWindowController(eventController_, eventWindowFactory_);
@@ -267,6 +266,8 @@ void MainController::handleConnected() {
mucSearchController_ = new MUCSearchController(jid_, uiEventStream_, mucSearchWindowFactory_, client_);
}
+ xmppRosterController_->requestRoster();
+
boost::shared_ptr<GetDiscoInfoRequest> discoInfoRequest(new GetDiscoInfoRequest(JID(), client_));
discoInfoRequest->onResponse.connect(boost::bind(&MainController::handleServerDiscoInfoResponse, this, _1, _2));
discoInfoRequest->send();