# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1082763355 0
# Node ID 48dd097eb47552c53d03fa56fe5d3c19b3200238
# Parent  ab295b8a95a0c852d81e75bc188574a127abc545
[gaim-migrate @ 9546]
Dialogs opened from a conversation window are now closed when the
conversation window is closed, preventing a crash. Patch by Kevin Stange.

committer: Tailor Script <tailor@pidgin.im>

diff -r ab295b8a95a0 -r 48dd097eb475 ChangeLog
--- a/ChangeLog	Fri Apr 23 23:23:49 2004 +0000
+++ b/ChangeLog	Fri Apr 23 23:35:55 2004 +0000
@@ -8,6 +8,8 @@
 	Bug Fixes:
 	* Gadu-Gadu updates (Andrew Wellington)
 	* Compiles again with gcc 2.96 (Ignacio J. Elia)
+	* Dialogs opened from a conversation window are now closed when
+	  the conversation window is closed, preventing a crash (Kevin Stange)
 
 version 0.77 (04/22/2004):
 	New Features:
diff -r ab295b8a95a0 -r 48dd097eb475 src/gtkimhtmltoolbar.c
--- a/src/gtkimhtmltoolbar.c	Fri Apr 23 23:23:49 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Fri Apr 23 23:35:55 2004 +0000
@@ -747,24 +747,18 @@
 {
 	GtkIMHtmlToolbar *toolbar = GTK_IMHTMLTOOLBAR(object);
 
-	if (toolbar->smiley_dialog != NULL)
-	{
-		gtk_widget_destroy(toolbar->smiley_dialog);
-		toolbar->smiley_dialog = NULL;
-	}
-
-	if (toolbar->link_dialog != NULL)
-	{
-		gaim_request_close(GAIM_REQUEST_FIELDS, toolbar->link_dialog);
-		toolbar->link_dialog = NULL;
-	}
-
 	if (toolbar->image_dialog != NULL)
 	{
 		gtk_widget_destroy(toolbar->image_dialog);
 		toolbar->image_dialog = NULL;
 	}
 
+	close_link_dialog(toolbar);
+	close_smiley_dialog(NULL, NULL, toolbar);
+	destroy_toolbar_font(NULL, NULL, toolbar);
+	destroy_toolbar_fgcolor(NULL, NULL, toolbar);
+	destroy_toolbar_bgcolor(NULL, NULL, toolbar);
+
 	if (toolbar->sml)
 		free(toolbar->sml);
 	gtk_object_sink(GTK_OBJECT(toolbar->tooltips));