# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1208303163 0
# Node ID e062a1dfe6ad30cf4b05bba6c6f45b7b505a16a8
# Parent  23fe481afccf7dce7ad6f165fda6c8944217bff6
Remove the "Use GSSAPI (Kerberos v5) for authentication" xmpp preference,
as it is not needed with Stu's changes in 7643bc26 which continue to the
next mechanism if GSSAPI fails.

diff -r 23fe481afccf -r e062a1dfe6ad libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Sun Apr 13 06:37:47 2008 +0000
+++ b/libpurple/protocols/jabber/auth.c	Tue Apr 15 23:46:03 2008 +0000
@@ -490,12 +490,6 @@
 	{
 		char *mech_name = xmlnode_get_data(mechnode);
 #ifdef HAVE_CYRUS_SASL
-		/* Skip the GSSAPI mechanism unless it's enabled for this account */
-		if (mech_name && !strcmp(mech_name, "GSSAPI") &&
-			!purple_account_get_bool(js->gc->account, "auth_gssapi", TRUE)) {
-			continue;
-		}
-
 		g_string_append(js->sasl_mechs, mech_name);
 		g_string_append_c(js->sasl_mechs, ' ');
 #else
diff -r 23fe481afccf -r e062a1dfe6ad libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Sun Apr 13 06:37:47 2008 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Tue Apr 15 23:46:03 2008 +0000
@@ -223,14 +223,6 @@
 						"auth_plain_in_clear", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						   option);
-
-#ifdef HAVE_CYRUS_SASL
-	option = purple_account_option_bool_new(
-											_("Use GSSAPI (Kerberos v5) for authentication"),
-											"auth_gssapi", TRUE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);	
-#endif
 	
 	option = purple_account_option_int_new(_("Connect port"), "port", 5222);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,