pidgin: 73eedf83: applied changes from 8b6590428d8180cc466...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 73eedf837c2384f502418f091300785c19ccfacd
Ancestor: 4074575d1418097eacac79c9b2cbef96cb788265
Author: evands at pidgin.im
Date: 2010-05-04T02:10:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/73eedf837c2384f502418f091300785c19ccfacd

Modified files:
        libpurple/protocols/jabber/auth_cyrus.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	bdafea53026edbce0b354e9394f89c2f35e9e5fe
+++ libpurple/protocols/jabber/auth_cyrus.c	fed26302066b1f11ae82a34cf7ace1aa27dc8499
@@ -391,17 +391,6 @@ jabber_cyrus_start(JabberStream *js, xml
 			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);