im.pidgin.pidgin: 65f3bcd3e7dfafc090e0cdfa3e7fff40d82e3c9c

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 65f3bcd3e7dfafc090e0cdfa3e7fff40d82e3c9c
Ancestor: 128a3fb0f62cc3c81468823030ef485661ca93e6
Author: sadrul at pidgin.im
Date: 2008-01-09T02:14:29
Branch: im.pidgin.pidgin

Modified files:
        libpurple/conversation.c

ChangeLog: 

I am going to go ahead and commit+push this revision/fix of purple_conversation_new.

-------------- next part --------------
============================================================
--- libpurple/conversation.c	89706e4bbd51f8cdb3b5581820d0a9294d9f4299
+++ libpurple/conversation.c	879f90587e8d3a00246a15f46752d3b5b9365dbe
@@ -295,10 +295,14 @@ purple_conversation_new(PurpleConversati
 	/* 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);