diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 12:52:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-30 12:52:49 +0100 |
| commit | d6c995608d4840df2bef38a5baf8e5b0f90915f8 (patch) | |
| tree | 7056a2662f734e174327e37625ef7a9d5c5fe49d | |
| parent | cb1aa11735d309a75377d2ab2134ea7cd166417e (diff) | |
| parent | ff317a2783058e8e90fac21bd8ba18359c5401f9 (diff) | |
Merge branch 'gabble-0.16'
| -rw-r--r-- | wocky/wocky-connector.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c index a35a24b..89f4369 100644 --- a/wocky/wocky-connector.c +++ b/wocky/wocky-connector.c @@ -1165,6 +1165,9 @@ xmpp_init_recv_cb (GObject *source, if (!priv->legacy_support) abort_connect_code (self, WOCKY_CONNECTOR_ERROR_NON_XMPP_V1_SERVER, "Server not XMPP 1.0 Compliant"); + else if (priv->tls_required && !priv->encrypted) + abort_connect_code (data, WOCKY_CONNECTOR_ERROR_TLS_UNAVAILABLE, + "TLS requested but server is not XMPP 1.0 compliant (try using \"old SSL\")"); else jabber_request_auth (self); } |