pidgin: 70c2ddd8: When restricting a buddy on both the All...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 70c2ddd8cc314e53815d3772bf1364a66164319a
Ancestor: c1a25a6a9f8ce3e163b199b0f5bd762e22447de6
Author: qulogic at pidgin.im
Date: 2009-10-30T06:46:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/70c2ddd8cc314e53815d3772bf1364a66164319a

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

ChangeLog: 

When restricting a buddy on both the Allow and Block lists to just one
list, directly change the internal structure instead of attempting to ask
the server to remove the buddy from the Block list. Obviously, we haven't
yet sent the server our list, so it won't be able to remove anyone from it.

(Also) Fixes #10613.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/notification.c	d54071f4d05e5c4b868d7dfeecfe2cc03ce62039
+++ libpurple/protocols/msn/notification.c	51ea52575c9de27a10c19f150fab4f32c47db525
@@ -670,7 +670,7 @@ msn_notification_dump_contact(MsnSession
 			                     "User %s is on both Allow and Block list; "
 			                     "removing from Allow list.\n",
 			                     user->passport);
-			msn_userlist_rem_buddy_from_list(session->userlist, user->passport, MSN_LIST_AL);
+			msn_user_unset_op(user, MSN_LIST_AL_OP);
 		}
 
 		if (user->networkid != MSN_NETWORK_UNKNOWN) {