Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c Fri May 02 22:50:13 2008 +0000 +++ b/libpurple/protocols/jabber/auth.c Fri May 02 22:51:14 2008 +0000 @@ -54,6 +54,11 @@ PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("Server requires TLS/SSL for login. No TLS/SSL support found.")); return TRUE; + } else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE)) { + purple_connection_error_reason (js->gc, + PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, + _("You require encryption, but no TLS/SSL support found.")); + return TRUE; } }