comparison libpurple/protocols/jabber/auth.c @ 22795:42dfa1139b5c

merge of '21d37789f674809d615fc7676a092f1da438b0f5' and 'aafbbc317ab5f69e31e0bb6cabc264bb70745ef2'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 02 May 2008 22:51:14 +0000
parents d5b3afea8764 abd261518b83
children ab9c48e85577 9d331ad0a8dc
comparison
equal deleted inserted replaced
22750:d5b3afea8764 22795:42dfa1139b5c
51 return TRUE; 51 return TRUE;
52 } else if(xmlnode_get_child(starttls, "required")) { 52 } else if(xmlnode_get_child(starttls, "required")) {
53 purple_connection_error_reason (js->gc, 53 purple_connection_error_reason (js->gc,
54 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, 54 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
55 _("Server requires TLS/SSL for login. No TLS/SSL support found.")); 55 _("Server requires TLS/SSL for login. No TLS/SSL support found."));
56 return TRUE;
57 } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE)) {
58 purple_connection_error_reason (js->gc,
59 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
60 _("You require encryption, but no TLS/SSL support found."));
56 return TRUE; 61 return TRUE;
57 } 62 }
58 } 63 }
59 64
60 return FALSE; 65 return FALSE;