pidgin: 40b061a8: Remove the "Use GSSAPI (Kerberos v5) for...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 40b061a8675f87ba328a5a07734084fdd7f3006a
Ancestor: 7643bc26fb7820fa60ef81d9d41fe6e3d4c9d8e5
Author: evands at pidgin.im
Date: 2008-04-15T23:46:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/40b061a8675f87ba328a5a07734084fdd7f3006a

Modified files:
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth.c	a70f9bb8fae9e24789d5f330e82adcfae7532f57
+++ libpurple/protocols/jabber/auth.c	30a16b10bc3edb17a6aacad8cd03dbadfd74192e
@@ -490,12 +490,6 @@ jabber_auth_start(JabberStream *js, xmln
 	{
 		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
============================================================
--- libpurple/protocols/jabber/libxmpp.c	072b2ecf94f9aab1c1129ec11dd8757124a9e000
+++ libpurple/protocols/jabber/libxmpp.c	729b8ce49aebaf45713070119f8d54882459a2d9
@@ -223,14 +223,6 @@ init_plugin(PurplePlugin *plugin)
 						"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,