Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 29692:fb99a0067812 | 29693:7925bb7f2aa7 |
|---|---|
| 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. |