]>
Commit | Line | Data |
---|---|---|
36c9fd1f AM |
1 | --- irssi-xmpp.org/src/core/xmpp-servers.c 2016-03-18 15:07:32.000000000 +0100 |
2 | +++ irssi-xmpp/src/core/xmpp-servers.c 2017-01-19 23:07:40.567300383 +0100 | |
3 | @@ -151,7 +151,7 @@ | |
4 | server->connect_pid = -1; | |
5 | ||
6 | if (server->connrec->port <= 0) | |
7 | - server->connrec->port = (server->connrec->use_ssl) ? | |
8 | + server->connrec->port = (server->connrec->use_tls) ? | |
9 | LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT; | |
10 | ||
11 | if (conn->real_jid == NULL) | |
12 | @@ -335,7 +335,7 @@ | |
13 | g_free(host); | |
14 | } else | |
15 | signal_emit("server connecting", 1, server); | |
16 | - if (server->connrec->use_ssl) | |
17 | + if (server->connrec->use_tls) | |
18 | signal_emit("xmpp server status", 2, server, | |
19 | "Using SSL encryption."); | |
20 | else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn))) | |
21 | @@ -470,7 +470,7 @@ | |
22 | return; | |
23 | error = NULL; | |
24 | err_msg = NULL; | |
25 | - if (server->connrec->use_ssl) { | |
26 | + if (server->connrec->use_tls) { | |
27 | if (!set_ssl(server->lmconn, &error, server, FALSE)) { | |
28 | err_msg = "Cannot init ssl"; | |
29 | goto err; |