Mercurial > pidgin.yaz
changeset 28787:9e1350072dec
merge of '53b11891588df0478720a5c40652312812cde6aa'
and '8af8abf5d55c259e186c6555093ee6d0a121749e'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 21 Oct 2009 23:29:39 +0000 |
| parents | 0645dc6eeed1 (diff) b937f137cd05 (current diff) |
| children | 72472238ad45 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/server.c Wed Oct 21 23:27:16 2009 +0000 +++ b/libpurple/server.c Wed Oct 21 23:29:39 2009 +0000 @@ -786,14 +786,14 @@ struct chat_invite_data *cid; int plugin_return; + g_return_if_fail(name != NULL); + g_return_if_fail(who != NULL); + account = purple_connection_get_account(gc); - 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(), "chat-invite-blocked", - account, who, name, message, data); - return; - } + if (!purple_privacy_check(account, who)) { + purple_signal_emit(purple_conversations_get_handle(), "chat-invite-blocked", + account, who, name, message, data); + return; } cid = g_new0(struct chat_invite_data, 1);