aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2015-03-11 08:13:42 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2015-03-11 08:13:42 +0100
commit9a54d355a672340f7b78f58f382c83c0f6974655 (patch)
tree42a1e3f53b789fe2bad2b7c8689f78737077f24e
parent02294cc0cf4e9a658da33e8d91896a4b6f2f9e8c (diff)
downloadqxmpp-9a54d355a672340f7b78f58f382c83c0f6974655.tar.gz
Add a QXmppClient::sslErrors signal to report SSL errors.
-rw-r--r--CHANGELOG5
-rw-r--r--src/client/QXmppClient.cpp4
-rw-r--r--src/client/QXmppClient.h6
3 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 26728821..fa810bbe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+QXmpp 0.8.3 (UNRELEASED)
+------------------------
+
+ - Add a QXmppClient::sslErrors signal to report SSL errors.
+
QXmpp 0.8.2 (Jan 7, 2015)
-------------------------
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 9b5d50fe..413afef0 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -124,6 +124,10 @@ QXmppClient::QXmppClient(QObject *parent)
this, SIGNAL(iqReceived(QXmppIq)));
Q_ASSERT(check);
+ check = connect(d->stream->socket(), SIGNAL(sslErrors(QList<QSslError>)),
+ this, SIGNAL(sslErrors(QList<QSslError>)));
+ Q_ASSERT(check);
+
check = connect(d->stream->socket(), SIGNAL(stateChanged(QAbstractSocket::SocketState)),
this, SLOT(_q_socketStateChanged(QAbstractSocket::SocketState)));
Q_ASSERT(check);
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index b2ca9b96..c42d05ed 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -31,6 +31,8 @@
#include "QXmppLogger.h"
#include "QXmppPresence.h"
+class QSslError;
+
class QXmppClientExtension;
class QXmppClientPrivate;
class QXmppPresence;
@@ -212,6 +214,10 @@ signals:
/// management, setting-getting vCards etc is done using iq stanzas.
void iqReceived(const QXmppIq &iq);
+ /// This signal is emitted to indicate that one or more SSL errors were
+ /// encountered while establishing the identity of the server.
+ void sslErrors(const QList<QSslError> &errors);
+
/// This signal is emitted when the client state changes.
void stateChanged(QXmppClient::State state);