Mercurial > hg
changeset 1895:7043542b3565
Do not block MUC private messages when 'block_unsubscribed' is set
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 11 Apr 2010 20:02:16 +0200 |
parents | c3271ac96173 |
children | c5ab9cf3819a |
files | mcabber/mcabber/xmpp.c |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp.c Sun Apr 11 19:49:52 2010 +0200 +++ b/mcabber/mcabber/xmpp.c Sun Apr 11 20:02:16 2010 +0200 @@ -1153,6 +1153,7 @@ // this is a regular message from an unsubscribed user. // System messages (from our server) are allowed. if (settings_opt_get_int("block_unsubscribed") && + (roster_gettype(bjid) != ROSTER_TYPE_ROOM) && !(roster_getsubscription(bjid) & sub_from) && (type != LM_MESSAGE_SUB_TYPE_GROUPCHAT)) { char *sbjid = jidtodisp(lm_connection_get_jid(lconnection));