Mercurial > pidgin.yaz
changeset 14598:e2798f3d3a45
[gaim-migrate @ 17325]
Why would someone not want to use TLS?
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 19 Sep 2006 23:46:17 +0000 |
| parents | 76542e1edf70 |
| children | 26e7d03d40c5 |
| files | libgaim/protocols/jabber/auth.c libgaim/protocols/jabber/jabber.c |
| diffstat | 2 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libgaim/protocols/jabber/auth.c Tue Sep 19 23:43:09 2006 +0000 +++ b/libgaim/protocols/jabber/auth.c Tue Sep 19 23:46:17 2006 +0000 @@ -41,17 +41,12 @@ xmlnode *starttls; if((starttls = xmlnode_get_child(packet, "starttls"))) { - if(gaim_account_get_bool(js->gc->account, "use_tls", TRUE) && - gaim_ssl_is_supported()) { + if(gaim_ssl_is_supported()) { jabber_send_raw(js, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1); return TRUE; } else if(xmlnode_get_child(starttls, "required")) { - if(gaim_ssl_is_supported()) { - gaim_connection_error(js->gc, _("Server requires TLS/SSL for login. Select \"Use TLS if available\" in account properties")); - } else { - gaim_connection_error(js->gc, _("Server requires TLS/SSL for login. No TLS/SSL support found.")); - } + gaim_connection_error(js->gc, _("Server requires TLS/SSL for login. No TLS/SSL support found.")); return TRUE; } }
--- a/libgaim/protocols/jabber/jabber.c Tue Sep 19 23:43:09 2006 +0000 +++ b/libgaim/protocols/jabber/jabber.c Tue Sep 19 23:46:17 2006 +0000 @@ -1961,11 +1961,6 @@ split = gaim_account_user_split_new(_("Resource"), "Home", '/'); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - option = gaim_account_option_bool_new(_("Use TLS if available"), "use_tls", - TRUE); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - option = gaim_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);