Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-20 11:35:33 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-01-20 11:35:33 (GMT) |
| commit | a4c19849c82745c8bde496f2e0a928c14fcbb56d (patch) | |
| tree | cd60d2b2e7a309624607219a5e3b170ae663506a /Swift/Controllers/MainController.cpp | |
| parent | 3a4a3a1804a0a43dd23c97287fe8d302be323bdd (diff) | |
| download | swift-a4c19849c82745c8bde496f2e0a928c14fcbb56d.zip swift-a4c19849c82745c8bde496f2e0a928c14fcbb56d.tar.bz2 | |
Added SuggestingJIDInput.
Change-Id: I34690b0a019da2b882a3eba28ba77e87f61bbe7a
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index b527583..89836c9 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -167,7 +167,7 @@ MainController::MainController( loginWindow_->setShowNotificationToggle(!notifier->isExternallyConfigured()); highlightManager_ = new HighlightManager(settings_); - highlightEditorController_ = new HighlightEditorController(uiEventStream_, contactSuggesterWithRoster_, uiFactory_, highlightManager_); + highlightEditorController_ = new HighlightEditorController(uiEventStream_, uiFactory_, highlightManager_); soundEventController_ = new SoundEventController(eventController_, soundPlayer, settings, highlightManager_); @@ -369,6 +369,7 @@ void MainController::handleConnected() { contactSuggesterWithoutRoster_->addContactProvider(chatsManager_); contactSuggesterWithRoster_->addContactProvider(chatsManager_); contactSuggesterWithRoster_->addContactProvider(contactsFromRosterProvider_); + highlightEditorController_->setContactSuggester(contactSuggesterWithoutRoster_); client_->onMessageReceived.connect(boost::bind(&ChatsManager::handleIncomingMessage, chatsManager_, _1)); chatsManager_->setAvatarManager(client_->getAvatarManager()); |