Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 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 | b2f91d7d3427 |
| children | 0b6475f97648 |
comparison
equal
deleted
inserted
replaced
| 23376:85fc34efe733 | 23417:1c6918e48104 |
|---|---|
| 1619 alias = purple_buddy_get_contact_alias(buddy); | 1619 alias = purple_buddy_get_contact_alias(buddy); |
| 1620 } | 1620 } |
| 1621 } | 1621 } |
| 1622 | 1622 |
| 1623 quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), | 1623 quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), |
| 1624 "chat-buddy-joining", conv, user, flag)) | | 1624 "chat-buddy-joining", conv, user, flag)) || |
| 1625 purple_conv_chat_is_user_ignored(chat, user); | 1625 purple_conv_chat_is_user_ignored(chat, user); |
| 1626 | 1626 |
| 1627 cbuddy = purple_conv_chat_cb_new(user, alias, flag); | 1627 cbuddy = purple_conv_chat_cb_new(user, alias, flag); |
| 1628 cbuddy->buddy = purple_find_buddy(conv->account, user) != NULL; | 1628 cbuddy->buddy = purple_find_buddy(conv->account, user) != NULL; |
| 1629 /* This seems dumb. Why should we set users thousands of times? */ | 1629 /* This seems dumb. Why should we set users thousands of times? */ |