pidgin: 5deb9ead: jabber: Eliminate spurious warning when ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5deb9ead35d214e3dafe29ded1938c1b7d59774d
Ancestor: 6a3e434792d4a871f84d3a8b6c98952491c3caad
Author: dreiss at facebook.com
Date: 2010-04-03T06:07:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5deb9ead35d214e3dafe29ded1938c1b7d59774d

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

ChangeLog: 

jabber: Eliminate spurious warning when connecting to Facebook. Fixes #11320

-------------- next part --------------
============================================================
--- ChangeLog	0a853882a9f0ff250e5c434abc0bd0d2780216d8
+++ ChangeLog	c07c8614425c7f32b68a48598d235b926069b900
@@ -73,6 +73,8 @@ version 2.7.0 (??/??/????):
 	* Validate the hash on incoming BoB data objects (for custom smileys etc.),
 	  cache based per JID when the CID is not a valid hash (as specified by the
 	  BoB XEP).
+	* Present a better error message when authentication fails while trying
+	  to connect to Facebook.  (David Reiss, Facebook)
 
 	Yahoo/Yahoo JAPAN:
 	* Attempt to better handle transparent proxies interfering with HTTP-based
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	7961f08b1d98e8bbb353c802d343d771e568832a
+++ libpurple/protocols/jabber/auth_cyrus.c	42c0a8cc33900006414ea216b7e68014ababa66f
@@ -404,11 +404,13 @@ jabber_cyrus_start(JabberStream *js, xml
 			continue;
 		}
 
-		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism, as we will not
-		 * support it and including it gives a false fall-back to other mechs offerred,
-		 * leading to incorrect error handling.
+		/* 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")) {
+		if (g_str_equal(mech_name, "X-GOOGLE-TOKEN")
+				|| g_str_equal(mech_name, "X-FACEBOOK-PLATFORM") ) {
 			g_free(mech_name);
 			continue;
 		}