summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2014-11-18 22:59:16 -0500
committerElliott Sales de Andrade <qulogic@pidgin.im>2014-11-18 22:59:16 -0500
commit1734009140d69c9bae74a42d3a6cf54dc8bb80ca (patch)
tree48cac700f4331389fa3941b613f5646b3609840c
parent2b652213d205dbe247eafd053d94fd0fad82e2a7 (diff)
downloadpidgin-1734009140d69c9bae74a42d3a6cf54dc8bb80ca.tar.gz
msn: Don't auto-Allow users on Pending list.
-rw-r--r--libpurple/protocols/msn/notification.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index fff82e986f..2b3f3348b6 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -628,9 +628,10 @@ msn_notification_dump_contact(MsnSession *session)
}
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);