Mercurial > hg
changeset 2087:305297d088c2
Fix GCC warning (variable set but not used)
author | franky |
---|---|
date | Fri, 25 Oct 2013 22:14:40 +0200 |
parents | 3667697d677d |
children | a18e1b488f1c |
files | mcabber/mcabber/xmpp.c |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp.c Fri Oct 25 21:27:31 2013 +0200 +++ b/mcabber/mcabber/xmpp.c Fri Oct 25 22:14:40 2013 +0200 @@ -1798,8 +1798,7 @@ // (no JID, no password, etc.) gint xmpp_connect(void) { - const char *userjid, *password, *resource, *servername; - const char *ssl_fpr, *ssl_ciphers; + const char *userjid, *password, *resource, *servername, *ssl_fpr; char *dynresource = NULL; char fpr[16]; const char *proxy_host; @@ -1820,7 +1819,6 @@ resource = settings_opt_get("resource"); proxy_host = settings_opt_get("proxy_host"); ssl_fpr = settings_opt_get("ssl_fingerprint"); - ssl_ciphers = settings_opt_get("ssl_ciphers"); if (!userjid) { scr_LogPrint(LPRINT_LOGNORM, "Your JID has not been specified!"); @@ -1956,10 +1954,11 @@ lssl = lm_ssl_new((ssl_fpr ? fpr : NULL), ssl_cb, NULL, NULL); if (lssl) { - lm_ssl_use_starttls(lssl, !ssl, tls); #ifdef HAVE_LM_SSL_CIPHER_LIST + const char *ssl_ciphers = settings_opt_get("ssl_ciphers"); lm_ssl_set_cipher_list(lssl, ssl_ciphers); #endif + lm_ssl_use_starttls(lssl, !ssl, tls); lm_connection_set_ssl(lconnection, lssl); lm_ssl_unref(lssl); } else if (ssl || tls) {