Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-12-23 19:36:00 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-12-23 19:36:00 (GMT) |
| commit | 506d1621530a40d3e59f50f693587c3c4fd724f5 (patch) | |
| tree | dfdd52d7b17ccfb372226192366bcb26d6bb6c0b /Swift/Controllers/MainController.cpp | |
| parent | 135f55589ef230ab009e3b961895a6d3b12cdc87 (diff) | |
| download | swift-506d1621530a40d3e59f50f693587c3c4fd724f5.zip swift-506d1621530a40d3e59f50f693587c3c4fd724f5.tar.bz2 | |
Turn the 'Find other users' into seperate add/chat menu items with a wizard.
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 660c12f..ba8d944 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -99,7 +99,8 @@ MainController::MainController( chatsManager_ = NULL; eventWindowController_ = NULL; mucSearchController_ = NULL; - userSearchController_ = NULL; + userSearchControllerChat_ = NULL; + userSearchControllerAdd_ = NULL; quitRequested_ = false; timeBeforeNextReconnect_ = -1; @@ -190,8 +191,10 @@ void MainController::resetClient() { statusTracker_ = NULL; delete profileSettings_; profileSettings_ = NULL; - delete userSearchController_; - userSearchController_ = NULL; + delete userSearchControllerChat_; + userSearchControllerChat_ = NULL; + delete userSearchControllerAdd_; + userSearchControllerAdd_ = NULL; } void MainController::handleUIEvent(boost::shared_ptr<UIEvent> event) { @@ -248,7 +251,8 @@ void MainController::handleConnected() { mucSearchController_ = new MUCSearchController(jid_, uiEventStream_, uiFactory_, client_->getIQRouter(), settings_, client_->getNickResolver()); - userSearchController_ = new UserSearchController(jid_, uiEventStream_, uiFactory_, client_->getIQRouter()); + userSearchControllerChat_ = new UserSearchController(UserSearchController::StartChat, jid_, uiEventStream_, uiFactory_, client_->getIQRouter()); + userSearchControllerAdd_ = new UserSearchController(UserSearchController::AddContact, jid_, uiEventStream_, uiFactory_, client_->getIQRouter()); } client_->requestRoster(); |