projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tackeling 30 sec ping timeout issues
[quassel.git]
/
src
/
qtui
/
coreconnectdlg.cpp
diff --git
a/src/qtui/coreconnectdlg.cpp
b/src/qtui/coreconnectdlg.cpp
index
16655ff
..
e6d3062
100644
(file)
--- a/
src/qtui/coreconnectdlg.cpp
+++ b/
src/qtui/coreconnectdlg.cpp
@@
-36,6
+36,7
@@
#include "coreconfigwizard.h"
#include "iconloader.h"
#include "quassel.h"
#include "coreconfigwizard.h"
#include "iconloader.h"
#include "quassel.h"
+#include "util.h"
CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
: QDialog(parent),
CoreConnectDlg::CoreConnectDlg(bool autoconnect, QWidget *parent)
: QDialog(parent),
@@
-556,16
+557,14
@@
void CoreAccountEditDlg::on_accountName_textChanged(const QString &text) {
}
}
+
// ========================================
// SslCertDisplayDialog
// ========================================
// ========================================
// SslCertDisplayDialog
// ========================================
+#ifdef HAVE_SSL
SslCertDisplayDialog::SslCertDisplayDialog(const QString &host, const QSslCertificate &cert, QWidget *parent)
: QDialog(parent)
{
SslCertDisplayDialog::SslCertDisplayDialog(const QString &host, const QSslCertificate &cert, QWidget *parent)
: QDialog(parent)
{
-#ifndef HAVE_SSL
- Q_UNUSED(cert)
-#else
-
setWindowTitle(tr("SSL Certificate used by %1").arg(host));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
setWindowTitle(tr("SSL Certificate used by %1").arg(host));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@
-600,6
+599,7
@@
SslCertDisplayDialog::SslCertDisplayDialog(const QString &host, const QSslCertif
for(int i = 0; i < mailaddresses.count(); i++) {
additionalLayout->addRow(tr("E-Mail Address %1:").arg(i + 1), new QLabel(mailaddresses[i], this));
}
for(int i = 0; i < mailaddresses.count(); i++) {
additionalLayout->addRow(tr("E-Mail Address %1:").arg(i + 1), new QLabel(mailaddresses[i], this));
}
+ additionalLayout->addRow(tr("Digest:"), new QLabel(QString(prettyDigest(cert.digest()))));
mainLayout->addWidget(additionalBox);
mainLayout->addWidget(additionalBox);
@@
-608,5
+608,5
@@
SslCertDisplayDialog::SslCertDisplayDialog(const QString &host, const QSslCertif
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+}
#endif
#endif
-};