Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-26 22:11:38 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-27 16:59:36 (GMT) |
| commit | 32dffa31b92ad29cc15cd6e6fe3cc4ef1b4ef23a (patch) | |
| tree | 83e444921b84fa86094553dfa256fa6f63038a0b /Swift/Controllers/MainController.cpp | |
| parent | 744884d4ed76658880a3d25f6e6551ef92700a8f (diff) | |
| download | swift-32dffa31b92ad29cc15cd6e6fe3cc4ef1b4ef23a.zip swift-32dffa31b92ad29cc15cd6e6fe3cc4ef1b4ef23a.tar.bz2 | |
Remember directory services used when searching for users
Test-Information:
Tested by searching at some services and checked that they
are present in the combo box after a Swift restart.
Change-Id: Ia30d932f20447f44e458af3b32a38665872da025
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index cdaa207..a0dde5b 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp | |||
| @@ -366,7 +366,7 @@ void MainController::handleConnected() { | |||
| 366 | contactSuggesterWithoutRoster_ = new ContactSuggester(); | 366 | contactSuggesterWithoutRoster_ = new ContactSuggester(); |
| 367 | contactSuggesterWithRoster_ = new ContactSuggester(); | 367 | contactSuggesterWithRoster_ = new ContactSuggester(); |
| 368 | 368 | ||
| 369 | userSearchControllerInvite_ = new UserSearchController(UserSearchController::InviteToChat, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_, contactSuggesterWithRoster_, client_->getAvatarManager(), client_->getPresenceOracle()); | 369 | userSearchControllerInvite_ = new UserSearchController(UserSearchController::InviteToChat, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_, contactSuggesterWithRoster_, client_->getAvatarManager(), client_->getPresenceOracle(), profileSettings_); |
| 370 | #ifdef SWIFT_EXPERIMENTAL_HISTORY | 370 | #ifdef SWIFT_EXPERIMENTAL_HISTORY |
| 371 | historyController_ = new HistoryController(storages_->getHistoryStorage()); | 371 | historyController_ = new HistoryController(storages_->getHistoryStorage()); |
| 372 | historyViewController_ = new HistoryViewController(jid_, uiEventStream_, historyController_, client_->getNickResolver(), client_->getAvatarManager(), client_->getPresenceOracle(), uiFactory_); | 372 | historyViewController_ = new HistoryViewController(jid_, uiEventStream_, historyController_, client_->getNickResolver(), client_->getAvatarManager(), client_->getPresenceOracle(), uiFactory_); |
| @@ -405,8 +405,8 @@ void MainController::handleConnected() { | |||
| 405 | client_->getDiscoManager()->setCapsNode(CLIENT_NODE); | 405 | client_->getDiscoManager()->setCapsNode(CLIENT_NODE); |
| 406 | client_->getDiscoManager()->setDiscoInfo(discoInfo); | 406 | client_->getDiscoManager()->setDiscoInfo(discoInfo); |
| 407 | 407 | ||
| 408 | userSearchControllerChat_ = new UserSearchController(UserSearchController::StartChat, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_, contactSuggesterWithRoster_, client_->getAvatarManager(), client_->getPresenceOracle()); | 408 | userSearchControllerChat_ = new UserSearchController(UserSearchController::StartChat, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_, contactSuggesterWithRoster_, client_->getAvatarManager(), client_->getPresenceOracle(), profileSettings_); |
| 409 | userSearchControllerAdd_ = new UserSearchController(UserSearchController::AddContact, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_, contactSuggesterWithoutRoster_, client_->getAvatarManager(), client_->getPresenceOracle()); | 409 | userSearchControllerAdd_ = new UserSearchController(UserSearchController::AddContact, jid_, uiEventStream_, client_->getVCardManager(), uiFactory_, client_->getIQRouter(), rosterController_, contactSuggesterWithoutRoster_, client_->getAvatarManager(), client_->getPresenceOracle(), profileSettings_); |
| 410 | adHocManager_ = new AdHocManager(JID(boundJID_.getDomain()), uiFactory_, client_->getIQRouter(), uiEventStream_, rosterController_->getWindow()); | 410 | adHocManager_ = new AdHocManager(JID(boundJID_.getDomain()), uiFactory_, client_->getIQRouter(), uiEventStream_, rosterController_->getWindow()); |
| 411 | 411 | ||
| 412 | chatsManager_->onImpromptuMUCServiceDiscovered.connect(boost::bind(&UserSearchController::setCanInitiateImpromptuMUC, userSearchControllerChat_, _1)); | 412 | chatsManager_->onImpromptuMUCServiceDiscovered.connect(boost::bind(&UserSearchController::setCanInitiateImpromptuMUC, userSearchControllerChat_, _1)); |