pidgin.2.6.5: 8399303c: *** Plucked rev aada73f0d8a35997280d570f...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 8399303c1520902107b5cdf263ddb926b0a450f0
Ancestor: 4b35328db9640a071b54ef4454887d390ac52c4f
Author: datallah at pidgin.im
Date: 2010-01-07T23:44:38
Branch: im.pidgin.pidgin.2.6.5
URL: http://d.pidgin.im/viewmtn/revision/info/8399303c1520902107b5cdf263ddb926b0a450f0

Modified files:
        libpurple/protocols/msn/userlist.c

ChangeLog: 

*** Plucked rev aada73f0d8a35997280d570f47caf30907fe68df (bcc0147bab874ca52c55ad4900545e17528bf8fd):
Make sure that libpurple core knows that a buddy is on the allow list just
after accepting their add request. Previously, this was not a problem, and
would go away at next login, but now that the core does its own client-side
blocking, it appears as if newly added buddies can't talk to you.

Fixes #10898.


-------------- next part --------------
============================================================
--- libpurple/protocols/msn/userlist.c	e72232eaee1d9913e7057aee1408ddbe22763039
+++ libpurple/protocols/msn/userlist.c	0d68ddaa46c5082561f9377f982957472037d0c4
@@ -50,8 +50,11 @@ msn_accept_add_cb(gpointer data)
 	{
 		MsnSession *session = pa->gc->proto_data;
 		MsnUserList *userlist = session->userlist;
+		PurpleAccount *account = purple_connection_get_account(pa->gc);
 
 		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
+		purple_privacy_deny_remove(account, pa->who, TRUE);
+		purple_privacy_permit_add(account, pa->who, TRUE);
 
 		msn_del_contact_from_list(session, NULL, pa->who, MSN_LIST_PL);
 	}