pidgin: 327007fa: Check in a change that does dumb client-...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 327007fa083ac3f2e7022e31c949497e38407725
Ancestor: 1eb8e9c77ed00655e830e5df76e4bc831c75634f
Author: markdoliner at pidgin.im
Date: 2009-08-18T22:31:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/327007fa083ac3f2e7022e31c949497e38407725

Modified files:
        libpurple/server.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/server.c	863f6dedb4926476e4134032a03dd0e515bdd1b4
+++ libpurple/server.c	080c1cb559263aca544f49a3f5aaf04b1882594b
@@ -592,13 +592,10 @@ void serv_got_im(PurpleConnection *gc, c
 	 */
 	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;
 	}
 
 	/*