# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1272939002 0
# Node ID ca60dd3812fad8b387dc97caed5ec1f15195c76a
# Parent  a81d44a11d994f85910c36bbd0de3b146c0af62b
applied changes from 8b6590428d8180cc466c8916f81aec2c8961fbd1
             through 1f5f812e500972cfb805d2cf0b3bc423cf2b7f3f

This hack to manually handle X-GOOGLE-TOKEN an X-FACEBOOK-PLATFORM shouldn't be
needed now; avoiding them was masking the problem, since we should be prepared
for a server to offer any number of arbitrary mechs which we may or may not
be able to handle.

diff -r a81d44a11d99 -r ca60dd3812fa libpurple/protocols/jabber/auth_cyrus.c
--- a/libpurple/protocols/jabber/auth_cyrus.c	Tue May 04 01:46:40 2010 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Tue May 04 02:10:02 2010 +0000
@@ -391,17 +391,6 @@
 			continue;
 		}
 
-		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism
-		 * or Facebook Chat's X-FACEBOOK-PLATFORM mechansim,
-		 * as we will not support them and including them gives a false fall-back
-		 * to other mechs offerred, leading to incorrect error handling.
-		 */
-		if (g_str_equal(mech_name, "X-GOOGLE-TOKEN")
-				|| g_str_equal(mech_name, "X-FACEBOOK-PLATFORM") ) {
-			g_free(mech_name);
-			continue;
-		}
-
 		g_string_append(js->sasl_mechs, mech_name);
 		g_string_append_c(js->sasl_mechs, ' ');
 		g_free(mech_name);