pidgin: d3bf1be2: This should be a boolean or, not a bitwi...

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: d3bf1be2c95a50ec491ede54d192f5b5564d9041
Ancestor: 420b71541a7786d593759ead8d775f487291fb97
Author: resiak at pidgin.im
Date: 2008-06-17T21:43:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d3bf1be2c95a50ec491ede54d192f5b5564d9041

Modified files:
        libpurple/conversation.c

ChangeLog: 

This should be a boolean or, not a bitwise or.

-------------- next part --------------
============================================================
--- libpurple/conversation.c	9b8652047568ff85d80a3094fde2ed5e96b12646
+++ libpurple/conversation.c	6a694c5b9a7547ce5dadac60c28fe6e0ca89aa39
@@ -1621,7 +1621,7 @@ purple_conv_chat_add_users(PurpleConvCha
 		}
 
 		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);