Mercurial > pidgin.yaz
changeset 22029:fbef14f35c78
I am going to go ahead and commit+push this revision/fix of purple_conversation_new.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 09 Jan 2008 02:14:29 +0000 |
| parents | bfa85af677f2 |
| children | 62147d5b4512 |
| files | libpurple/conversation.c |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/conversation.c Mon Jan 07 15:16:33 2008 +0000 +++ b/libpurple/conversation.c Wed Jan 09 02:14:29 2008 +0000 @@ -295,10 +295,14 @@ /* Check if this conversation already exists. */ if ((conv = purple_find_conversation_with_account(type, name, account)) != NULL) { - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && + if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_CHAT || purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) - purple_conversation_chat_cleanup_for_rejoin(conv); - return conv; + { + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) + purple_conversation_chat_cleanup_for_rejoin(conv); + + return conv; + } } gc = purple_account_get_connection(account);