diff libpurple/protocols/jabber/auth.c @ 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 46fd79aa46c5
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."));