Mercurial > pidgin.yaz
changeset 23417:1c6918e48104
This should be a boolean or, not a bitwise or.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Tue, 17 Jun 2008 21:43:23 +0000 |
| parents | 85fc34efe733 |
| children | 0b6475f97648 |
| files | libpurple/conversation.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Mon Jun 16 15:19:11 2008 +0000 +++ b/libpurple/conversation.c Tue Jun 17 21:43:23 2008 +0000 @@ -1621,7 +1621,7 @@ } quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), - "chat-buddy-joining", conv, user, flag)) | + "chat-buddy-joining", conv, user, flag)) || purple_conv_chat_is_user_ignored(chat, user); cbuddy = purple_conv_chat_cb_new(user, alias, flag);