Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-07-08 07:41:54 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-07-08 07:41:54 (GMT) |
| commit | bd7a78529da15acb0698453d77324cdc8a02005f (patch) | |
| tree | 96e98ce78648148979aae3f2ad786dc8f431e7a6 /Swift/Controllers/MainController.cpp | |
| parent | 3ef9dabfc62cb3daf0b88543a5d65d31e8eb5977 (diff) | |
| download | swift-bd7a78529da15acb0698453d77324cdc8a02005f.zip swift-bd7a78529da15acb0698453d77324cdc8a02005f.tar.bz2 | |
Morph the login window into the roster before re-enabling login.
Resolves: #920
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 3d9d25a..58b2dbe 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -255,12 +255,13 @@ void MainController::resetCurrentError() { void MainController::handleConnected() { boundJID_ = client_->getJID(); - loginWindow_->setIsLoggingIn(false); resetCurrentError(); resetPendingReconnects(); + if (eagleMode_) { purgeCachedCredentials(); } + bool freshLogin = rosterController_ == NULL; myStatusLooksOnline_ = true; if (freshLogin) { @@ -290,7 +291,8 @@ void MainController::handleConnected() { userSearchControllerAdd_ = new UserSearchController(UserSearchController::AddContact, jid_, uiEventStream_, uiFactory_, client_->getIQRouter(), rosterController_); adHocManager_ = new AdHocManager(boundJID_, uiFactory_, client_->getIQRouter(), uiEventStream_, rosterController_->getWindow()); } - + loginWindow_->setIsLoggingIn(false); + client_->requestRoster(); GetDiscoInfoRequest::ref discoInfoRequest = GetDiscoInfoRequest::create(boundJID_.toBare(), client_->getIQRouter()); |