Mercurial > pidgin.yaz
changeset 28891:4fd0baa32a9e
jabber: Fix a few places where the default for require_tls was wrong.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 06 Nov 2009 08:55:36 +0000 |
| parents | 5328e205d3fb |
| children | cfcdf15459a5 |
| files | libpurple/protocols/jabber/auth.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/jabber.h libpurple/protocols/jabber/libxmpp.c |
| diffstat | 4 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c Fri Nov 06 08:47:28 2009 +0000 +++ b/libpurple/protocols/jabber/auth.c Fri Nov 06 08:55:36 2009 +0000 @@ -58,7 +58,7 @@ PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("Server requires TLS/SSL, but no TLS/SSL support was found.")); return TRUE; - } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE)) { + } else if(purple_account_get_bool(js->gc->account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) { purple_connection_error_reason(js->gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("You require encryption, but no TLS/SSL support was found.")); @@ -698,7 +698,7 @@ * is requiring SSL/TLS, we need to enforce it. */ if (!jabber_stream_is_ssl(js) && - purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", FALSE)) { + purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) { purple_connection_error_reason(js->gc, PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR, _("You require encryption, but it is not available on this server."));
--- a/libpurple/protocols/jabber/jabber.c Fri Nov 06 08:47:28 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Nov 06 08:55:36 2009 +0000 @@ -200,7 +200,7 @@ jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION); return; } - } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !jabber_stream_is_ssl(js)) { + } else if(purple_account_get_bool(js->gc->account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS) && !jabber_stream_is_ssl(js)) { purple_connection_error_reason(js->gc, PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR, _("You require encryption, but it is not available on this server."));
--- a/libpurple/protocols/jabber/jabber.h Fri Nov 06 08:47:28 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Fri Nov 06 08:55:36 2009 +0000 @@ -76,6 +76,8 @@ #define CAPS0115_NODE "http://pidgin.im/" +#define JABBER_DEFAULT_REQUIRE_SSL TRUE + /* Index into attention_types list */ #define JABBER_BUZZ 0
--- a/libpurple/protocols/jabber/libxmpp.c Fri Nov 06 08:47:28 2009 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Fri Nov 06 08:55:36 2009 +0000 @@ -355,7 +355,7 @@ purple_account_user_split_set_reverse(split, FALSE); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", TRUE); + option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", JABBER_DEFAULT_REQUIRE_TLS); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);