Mercurial > pidgin.yaz
changeset 22654:d632ea5dc9e5
merge of '40b061a8675f87ba328a5a07734084fdd7f3006a'
and 'd232d797aa7f444c80d47cf543f62a260c2b02b0'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 15 Apr 2008 23:46:13 +0000 |
| parents | e062a1dfe6ad (diff) 57f5337a9c28 (current diff) |
| children | fa7e07c74a59 |
| files | |
| diffstat | 2 files changed, 0 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth.c Tue Apr 15 16:21:24 2008 +0000 +++ b/libpurple/protocols/jabber/auth.c Tue Apr 15 23:46:13 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
--- a/libpurple/protocols/jabber/libxmpp.c Tue Apr 15 16:21:24 2008 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Tue Apr 15 23:46:13 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,