summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-07-08 07:41:54 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-07-08 07:41:54 (GMT)
commitbd7a78529da15acb0698453d77324cdc8a02005f (patch)
tree96e98ce78648148979aae3f2ad786dc8f431e7a6
parent3ef9dabfc62cb3daf0b88543a5d65d31e8eb5977 (diff)
downloadswift-bd7a78529da15acb0698453d77324cdc8a02005f.zip
swift-bd7a78529da15acb0698453d77324cdc8a02005f.tar.bz2
Morph the login window into the roster before re-enabling login.
Resolves: #920
-rw-r--r--Swift/Controllers/Chat/UnitTest/MockChatListWindow.h2
-rw-r--r--Swift/Controllers/MainController.cpp6
-rw-r--r--Swift/QtUI/ChatList/QtChatListWindow.cpp2
3 files changed, 6 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
index b1e1329..6ac8d4a 100644
--- a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
+++ b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
@@ -18,7 +18,7 @@ namespace Swift {
void removeMUCBookmark(const MUCBookmark& /*bookmark*/) {}
void setBookmarksEnabled(bool /*enabled*/) {}
void setRecents(const std::list<ChatListWindow::Chat>& /*recents*/) {}
- void setUnreadCount(int unread) {}
+ void setUnreadCount(int /*unread*/) {}
void clearBookmarks() {}
};
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());
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.cpp b/Swift/QtUI/ChatList/QtChatListWindow.cpp
index cfbbcb9..fab6374 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.cpp
+++ b/Swift/QtUI/ChatList/QtChatListWindow.cpp
@@ -99,7 +99,7 @@ void QtChatListWindow::setRecents(const std::list<ChatListWindow::Chat>& recents
model_->setRecents(recents);
}
-void QtChatListWindow::setUnreadCount(int unread) {
+void QtChatListWindow::setUnreadCount(int /*unread*/) {
}