adium.1-4: c1dfa6c2: applied changes from 06fcbcb8d044bcd6887...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: c1dfa6c2ae316d7bd8ad45d65327edc7fe1174a3
Parent:   b65dfab57c19509d1026f43fbc94188e5d336c4f
Author:   evands at pidgin.im
Date:     09/22/10 01:13:08
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/c1dfa6c2ae316d7bd8ad45d65327edc7fe1174a3

Changelog: 

applied changes from 06fcbcb8d044bcd6887415dc87274071bb724596
             through 0673f8579282f4181ac7fb5738a1afc873b57cac

applied changes from 0673f8579282f4181ac7fb5738a1afc873b57cac
             through 63223dd28d39ec1b2e6b4f834003f60f33583385

Changes against parent b65dfab57c19509d1026f43fbc94188e5d336c4f

  patched  ChangeLog
  patched  libpurple/protocols/jabber/auth_cyrus.c

-------------- next part --------------
============================================================
--- ChangeLog	fdb9ce08f2e43e7feda94510fdc5908a9e637155
+++ ChangeLog	ca7aa0bff92b903dd07ba0eadfea297bfd1e3f6d
@@ -136,6 +136,10 @@ version 2.7.2 (07/21/2010):
 	MSN:
 	* Fix a crash related to fast buddy icon transfers.
 
+	XMPP:
+	* Allow connecting to servers that only advertise GSSAPI and expect
+	  a fallback to legacy IQ authentication (broken in 2.7.0).
+
 version 2.7.1 (05/29/2010):
 	General:
 	* Build fixes on OpenSolaris.  (Brian Lu)
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	e961e5741b7786a2e9658c05046091aa7903385a
+++ libpurple/protocols/jabber/auth_cyrus.c	4b14fe1333de16b70cd6e8bf629b54923378ba22
@@ -431,6 +431,10 @@ jabber_cyrus_start(JabberStream *js, xml
 		g_free(mech_name);
 	}
 
+	/* Strip off the trailing ' ' */
+	if (js->sasl_mechs->len > 1)
+		g_string_truncate(js->sasl_mechs, js->sasl_mechs->len - 1);
+
 	jabber_sasl_build_callbacks(js);
 	return jabber_auth_start_cyrus(js, reply, error);
 }