[Gaim-commits] SF.net SVN: gaim: [17325] trunk/libgaim/protocols/jabber

[<the...@us...>]

Revision: 17325
          http://svn.sourceforge.net/gaim/?rev=17325&view=rev
Author:   thekingant
Date:     2006-09-19 16:46:17 -0700 (Tue, 19 Sep 2006)

Log Message:
-----------
Why would someone not want to use TLS?

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/auth.c
    trunk/libgaim/protocols/jabber/jabber.c

Modified: trunk/libgaim/protocols/jabber/auth.c
===================================================================
--- trunk/libgaim/protocols/jabber/auth.c	2006-09-19 23:43:09 UTC (rev 17324)
+++ trunk/libgaim/protocols/jabber/auth.c	2006-09-19 23:46:17 UTC (rev 17325)
@@ -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;
 		}
 	}

Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	2006-09-19 23:43:09 UTC (rev 17324)
+++ trunk/libgaim/protocols/jabber/jabber.c	2006-09-19 23:46:17 UTC (rev 17325)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.