# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1128215190 0
# Node ID d35e4f1e9f43a0f8f03eab30c6995dbf775275c3
# Parent  9b3833da6840b5bfa1c580e3d2db83c7ad9d1496
[gaim-migrate @ 13852]
I think this is better. It should prevent empty windows.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9b3833da6840 -r d35e4f1e9f43 src/gtkconv.c
--- a/src/gtkconv.c	Sun Oct 02 00:32:49 2005 +0000
+++ b/src/gtkconv.c	Sun Oct 02 01:06:30 2005 +0000
@@ -3939,9 +3939,6 @@
 		return;
 
 	gaim_gtk_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-	/* should we be doing this here or in gaim_gtk_conv_window_remove_gtkconv()? */
-	if (!gtkconv->win->gtkconvs)
-		gaim_gtk_conv_window_destroy(gtkconv->win);
 
 	/* If the "Save Conversation" or "Save Icon" dialogs are open then close them */
 	gaim_request_close_with_handle(conv);
@@ -6439,6 +6436,9 @@
 	    }
 
 	win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv);
+
+	if (!win->gtkconvs)
+		gaim_gtk_conv_window_destroy(win);
 }
 
 GaimGtkConversation *