ldap: Don't use the backend's display name as identifier

[quassel.git] / src / qtui / coreconfigwizard.cpp

diff --git a/src/qtui/coreconfigwizard.cpp b/src/qtui/coreconfigwizard.cpp
index a4cfe16..401fd61 100644 (file)
--- a/src/qtui/coreconfigwizard.cpp
+++ b/src/qtui/coreconfigwizard.cpp
@@ -40,7 +40,7 @@ CoreConfigWizard::CoreConfigWizard(CoreConnection *connection, const QList<QVari
         _backends[v.toMap()["DisplayName"].toString()] = v;
 
     foreach(const QVariant &v, authenticators)
-        _authenticators[v.toMap()["DisplayName"].toString()] = v;
+        _authenticators[v.toMap()["BackendId"].toString()] = v;
 
     setPage(IntroPage, new CoreConfigWizardPages::IntroPage(this));
     setPage(AdminUserPage, new CoreConfigWizardPages::AdminUserPage(this));
@@ -222,7 +222,6 @@ AuthenticationSelectionPage::AuthenticationSelectionPage(const QHash<QString, QV
 
     setTitle(tr("Select Authentication Backend"));
     setSubTitle(tr("Please select a backend for Quassel Core to use for authenticating users."));
-    setCommitPage(true);
 
     registerField("authentication.backend", ui.backendList);
 
@@ -246,7 +245,7 @@ QString AuthenticationSelectionPage::selectedBackend() const
 }
 
 
-QVariantMap AuthenticationSelectionPage::connectionProperties() const
+QVariantMap AuthenticationSelectionPage::authProperties() const
 {
     QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
 
@@ -512,7 +511,7 @@ void SyncPage::initializePage()
     // Fill in sync info about the authentication layer.
     AuthenticationSelectionPage *authPage = qobject_cast<AuthenticationSelectionPage *>(wizard()->page(CoreConfigWizard::AuthenticationSelectionPage));
     QString authenticator = authPage->selectedBackend();
-    QVariantMap authProperties = authPage->connectionProperties();
+    QVariantMap authProperties = authPage->authProperties();
     Q_ASSERT(!authenticator.isEmpty());
     ui.authenticator->setText(authenticator);