changeset 28344: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 e3afedf82bb6
children de7bbdcb695b
files libpurple/server.c
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/server.c	Tue Aug 18 22:28:12 2009 +0000
+++ b/libpurple/server.c	Tue Aug 18 22:31:39 2009 +0000
@@ -592,13 +592,10 @@
 	 */
 	flags |= PURPLE_MESSAGE_RECV;
 
-	if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->set_permit_deny == NULL) {
-		/* protocol does not support privacy, handle it ourselves */
-		if (!purple_privacy_check(account, who)) {
-			purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
-					account, who, msg, flags, (unsigned int)mtime);
-			return;
-		}
+	if (!purple_privacy_check(account, who)) {
+		purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
+				account, who, msg, flags, (unsigned int)mtime);
+		return;
 	}
 
 	/*