# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1211335178 0
# Node ID 69796bbe7a6d4e51b2cbe86c74a9af1c05f109f7
# Parent  16bdfbe5b0b43fd31b0dcf58708f8d0836c44853# Parent  0ae9c9befa63221c8ce0fcbf4e17024fd996e2e7
merge of '59d7f03afa561d4e3ef6d618e8d8d2a99c0dee88'
     and '987d475b7796c72aacb0fbc5112840600ba70d61'

diff -r 16bdfbe5b0b4 -r 69796bbe7a6d libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Wed May 21 01:58:33 2008 +0000
+++ b/libpurple/protocols/jabber/auth.c	Wed May 21 01:59:38 2008 +0000
@@ -503,8 +503,10 @@
 		 * support it and including it gives a false fall-back to other mechs offerred,
 		 * leading to incorrect error handling.
 		 */
-		if (mech_name && !strcmp(mech_name, "X-GOOGLE-TOKEN"))
+		if (mech_name && !strcmp(mech_name, "X-GOOGLE-TOKEN")) {
+			g_free(mech_name);
 			continue;
+		}
 
 		g_string_append(js->sasl_mechs, mech_name);
 		g_string_append_c(js->sasl_mechs, ' ');