# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1007801160 0
# Node ID 19f786779b084e44599cee211ed8431f51bf7c66
# Parent  86e74a0c2f6e3ae8faaa17e85b3ea76ef1346e9d
[gaim-migrate @ 2868]
huh

committer: Tailor Script <tailor@pidgin.im>

diff -r 86e74a0c2f6e -r 19f786779b08 src/conversation.c
--- a/src/conversation.c	Fri Dec 07 00:19:06 2001 +0000
+++ b/src/conversation.c	Sat Dec 08 08:46:00 2001 +0000
@@ -451,12 +451,14 @@
 		}
 	} else {
 		if (chat_options & OPT_CHAT_ONE_WINDOW) {
-			if ((g_list_length(chats) > 1) ||
-					((convo_options & OPT_CONVO_COMBINE) &&
-					 (im_options & OPT_IM_ONE_WINDOW) && conversations)) {
+			if ((convo_options & OPT_CONVO_COMBINE) &&
+					 (im_options & OPT_IM_ONE_WINDOW) && conversations) {
 				gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
 							 g_list_index(chats, c) +
 								g_list_length(conversations));
+			} else if (g_list_length(chats) > 1) {
+				gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
+							 g_list_index(chats, c));
 			} else {
 				if (c->window)
 					gtk_widget_destroy(c->window);
@@ -1453,7 +1455,7 @@
 	char buf2[BUF_LONG];
 	char mdate[64];
 
-	if (c->is_chat && (!c->gc || !g_slist_find(c->gc->buddy_chats, c)))
+	if (c->is_chat && !g_list_find(chats, c))
 		return;
 
 	if (!c->is_chat && !g_list_find(conversations, c))