Mercurial > pidgin.yaz
diff libpurple/server.c @ 29693:7925bb7f2aa7
propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f)
to branch 'im.pidgin.cpw.attention_ui' (head 563c35d20efcc234a74567ebb88c059d10ce1e09)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 24 Aug 2009 19:23:56 +0000 |
| parents | 2ee64cfbbe2e |
| children | 4a2adf413aaa dab0d17dc6c1 |
line wrap: on
line diff
--- a/libpurple/server.c Thu Aug 13 17:42:44 2009 +0000 +++ b/libpurple/server.c Mon Aug 24 19:23:56 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; } /*