cleanups (WiP)

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

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index d7d52de..dfbf9db 100644 (file)
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -28,7 +28,7 @@
 #include "clientsyncer.h"
 #include "coreconfigwizard.h"
 
-CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
+CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
   : QDialog(parent)
 {
   ui.setupUi(this);
@@ -39,8 +39,6 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent, bool autoconnect)
   clientSyncer = new ClientSyncer(this);
   wizard = 0;
 
-  setAttribute(Qt::WA_DeleteOnClose);
-
   doingAutoConnect = false;
 
   ui.stackedWidget->setCurrentWidget(ui.accountPage);
@@ -445,7 +443,7 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
     ui.port->setValue(acct["Port"].toUInt());
     ui.useInternal->setChecked(acct["UseInternal"].toBool());
     ui.accountName->setText(acct["AccountName"].toString());
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
     ui.useSsl->setChecked(acct["useSsl"].toBool());
 #else
     ui.useSsl->setChecked(false);
@@ -459,11 +457,19 @@ CoreAccountEditDlg::CoreAccountEditDlg(AccountId id, const QVariantMap &acct, co
     ui.proxyPassword->setText(acct["proxyPassword"].toString());
   } else {
     setWindowTitle(tr("Add Core Account"));
-#ifdef QT_NO_OPENSSL
+#ifndef HAVE_SSL
     ui.useSsl->setChecked(false);
     ui.useSsl->setEnabled(false);
 #endif
   }
+
+#ifndef BUILD_MONO
+  // if we don't have a mono build we hide the option to use the internal connection and force the setting to use remote host
+  ui.useInternal->setChecked(false);
+  ui.useInternal->hide();
+  ui.useRemote->hide();
+  ui.labelUseBuiltinCore->hide();
+#endif
 }
 
 QVariantMap CoreAccountEditDlg::accountData() {