# HG changeset patch # User Mikael Berthe # Date 1271008936 -7200 # Node ID 7043542b3565a2f90e88e61e5ed5f30be2f16e5e # Parent c3271ac961737d5ef254b52f6cd9e9e9f8409505 Do not block MUC private messages when 'block_unsubscribed' is set diff -r c3271ac96173 -r 7043542b3565 mcabber/mcabber/xmpp.c --- 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));