# HG changeset patch # User Mikael Berthe # Date 1300194464 -3600 # Node ID 5d718766d2d691c58113aa527a3d43a50bd965e6 # Parent d41623dd88ee149efe65efd18e5bbcfffde1f8e8 Do not block system messages when block_unsubscribed is set This was broken in 0.10.0 when switching to LM. Reported by roughnecks in the MUC room, issue spotted by Hermitifier. diff -r d41623dd88ee -r 5d718766d2d6 mcabber/mcabber/xmpp.c --- a/mcabber/mcabber/xmpp.c Tue Mar 15 12:29:24 2011 +0100 +++ b/mcabber/mcabber/xmpp.c Tue Mar 15 14:07:44 2011 +0100 @@ -1157,7 +1157,7 @@ (type != LM_MESSAGE_SUB_TYPE_GROUPCHAT)) { char *sbjid = jidtodisp(lm_connection_get_jid(lconnection)); const char *server = strchr(sbjid, JID_DOMAIN_SEPARATOR); - if (g_strcmp0(server, bjid)) { + if (server && g_strcmp0(server+1, bjid)) { scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid); g_free(sbjid); goto gotmessage_return;