/pidgin/main: 277fb538e26f: msn: Don't auto-Allow users on Pendi...
Elliott Sales de Andrade <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 277fb538e26f66cd9965f5a3cdb1c9d72286530d Author: Elliott Sales de Andrade <[email protected]> Date: 2014-11-18 22:59 -0500 Branch: release-2.x.y URL: https://hg.pidgin.im/pidgin/main/rev/277fb538e26f Description: msn: Don't auto-Allow users on Pending list. diffstat: libpurple/protocols/msn/notification.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c --- a/libpurple/protocols/msn/notification.c +++ b/libpurple/protocols/msn/notification.c @@ -628,9 +628,10 @@ msn_notification_dump_contact(MsnSession } if (user->networkid != MSN_NETWORK_UNKNOWN) { - if ((user->list_op & MSN_LIST_OP_MASK & ~MSN_LIST_FL_OP) == 0) { + if ((user->list_op & (MSN_LIST_OP_MASK | MSN_LIST_PL_OP)) == MSN_LIST_FL_OP) { purple_debug_warning("msn", - "User %s is on neither Allow nor Block list; " + "User %s is on neither Allow nor Block list, " + "and not Pending addition; " "adding to Allow list.\n", user->passport); msn_user_set_op(user, MSN_LIST_AL_OP);