adium.1-4: a64d01ab: pidgin-facebookchat at r706.

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: a64d01ab86051ba3465be919dc329e284812744b
Ancestor: 0dda87d90d5f02ae0be753abd14051110308692a
Author: zacw at adiumx.com
Date: 2009-12-01T23:28:12
Branch: im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/a64d01ab86051ba3465be919dc329e284812744b

Modified files:
        libpurple/protocols/facebook/fb_managefriends.c
        libpurple/protocols/facebook/libfacebook.c

ChangeLog: 

pidgin-facebookchat at r706.

-------------- next part --------------
============================================================
--- libpurple/protocols/facebook/fb_managefriends.c	93713f1e6206437c49d8bf7cc05bc1eb8d428762
+++ libpurple/protocols/facebook/fb_managefriends.c	516b4021a1e5ae8a0ac3ba133229c0c1e29b68e9
@@ -147,7 +147,6 @@ static void fb_check_friend_request_cb(F
 		g_hash_table_insert(fba->auth_buddies, uid, NULL);
 		
 		g_free(name);
-		g_free(uid);
 		g_free(msg_plain);		
 	}
 }
============================================================
--- libpurple/protocols/facebook/libfacebook.c	5d4f66c73c778b670d6a1e35a929bd0b78cff058
+++ libpurple/protocols/facebook/libfacebook.c	d028106d5c81dae7840e3864ef302e444d75dfad
@@ -225,7 +225,7 @@ static void fb_login_cb(FacebookAccount 
 {
 	gchar *user_cookie;
 	
-	if (len && g_strstr_len(response, len, "captcha"))
+	if (len && g_strstr_len(response, len, "captcha") && !purple_account_get_bool(fba->account, "ignore-facebook-captcha", FALSE))
 	{
 		purple_debug_info("facebook", "captcha page: %s\n", response);