pidgin/pidgin

msn: Don't auto-Allow users on Pending list.
release-2.x.y
2014-11-18, Elliott Sales de Andrade
277fb538e26f
Parents 9afe309dc92a
Children e1fa63d0bdaa
msn: Don't auto-Allow users on Pending list.
--- a/libpurple/protocols/msn/notification.c Tue Nov 18 22:34:52 2014 -0500
+++ b/libpurple/protocols/msn/notification.c Tue Nov 18 22:59:16 2014 -0500
@@ -628,9 +628,10 @@
}
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);