comparison libpurple/server.c @ 27994:2ee64cfbbe2e

Check in a change that does dumb client-side blocking of people on your block list, for when the protocol doesn't do it for us. I think this is the behavior user's expect, and most of us seemed to be in favor of this when we talked about it on the devel list recently. This is really just to hold us over until Sulabh's privay changes are ready.
author Mark Doliner <mark@kingant.net>
date Tue, 18 Aug 2009 22:31:39 +0000
parents 31905a0d1c9d
children dab0d17dc6c1
comparison
equal deleted inserted replaced
27993:e3afedf82bb6 27994:2ee64cfbbe2e
590 /* 590 /*
591 * XXX: Should we be setting this here, or relying on prpls to set it? 591 * XXX: Should we be setting this here, or relying on prpls to set it?
592 */ 592 */
593 flags |= PURPLE_MESSAGE_RECV; 593 flags |= PURPLE_MESSAGE_RECV;
594 594
595 if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->set_permit_deny == NULL) { 595 if (!purple_privacy_check(account, who)) {
596 /* protocol does not support privacy, handle it ourselves */ 596 purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
597 if (!purple_privacy_check(account, who)) { 597 account, who, msg, flags, (unsigned int)mtime);
598 purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg", 598 return;
599 account, who, msg, flags, (unsigned int)mtime);
600 return;
601 }
602 } 599 }
603 600
604 /* 601 /*
605 * We should update the conversation window buttons and menu, 602 * We should update the conversation window buttons and menu,
606 * if it exists. 603 * if it exists.