Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/xmpp.c @ 1963:5d718766d2d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mikael Berthe <mikael@lilotux.net>
date Tue, 15 Mar 2011 14:07:44 +0100
parents 9f443617e96b
children 45f0f0f60656
comparison
equal deleted inserted replaced
1962:d41623dd88ee 1963:5d718766d2d6
1155 (roster_gettype(bjid) != ROSTER_TYPE_ROOM) && 1155 (roster_gettype(bjid) != ROSTER_TYPE_ROOM) &&
1156 !(roster_getsubscription(bjid) & sub_from) && 1156 !(roster_getsubscription(bjid) & sub_from) &&
1157 (type != LM_MESSAGE_SUB_TYPE_GROUPCHAT)) { 1157 (type != LM_MESSAGE_SUB_TYPE_GROUPCHAT)) {
1158 char *sbjid = jidtodisp(lm_connection_get_jid(lconnection)); 1158 char *sbjid = jidtodisp(lm_connection_get_jid(lconnection));
1159 const char *server = strchr(sbjid, JID_DOMAIN_SEPARATOR); 1159 const char *server = strchr(sbjid, JID_DOMAIN_SEPARATOR);
1160 if (g_strcmp0(server, bjid)) { 1160 if (server && g_strcmp0(server+1, bjid)) {
1161 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid); 1161 scr_LogPrint(LPRINT_LOGNORM, "Blocked a message from <%s>", bjid);
1162 g_free(sbjid); 1162 g_free(sbjid);
1163 goto gotmessage_return; 1163 goto gotmessage_return;
1164 } 1164 }
1165 g_free(sbjid); 1165 g_free(sbjid);