# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1008497515 0
# Node ID 58baac124b0dde3997026eb6b7072c0b9bf65907
# Parent  02f048b661559d71201a4172722d9646a8c68471
[gaim-migrate @ 2904]
2.4.17-pre5 is better than 2.4.17-rc1, i think.

committer: Tailor Script <tailor@pidgin.im>

diff -r 02f048b66155 -r 58baac124b0d src/conversation.c
--- a/src/conversation.c	Sun Dec 16 02:29:56 2001 +0000
+++ b/src/conversation.c	Sun Dec 16 10:11:55 2001 +0000
@@ -453,12 +453,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 || chats->next)) {
 				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);