# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1213739003 0
# Node ID 1c6918e48104ae8dd51580cf6adb05fa33db0f69
# Parent  85fc34efe733fb127287e76c60243b31b5b4689c
This should be a boolean or, not a bitwise or.

diff -r 85fc34efe733 -r 1c6918e48104 libpurple/conversation.c
--- 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);