Prevent a crash when the imhtmltoolbar is disposed and the smiley dialog is open.

Tue, 27 May 2008 17:31:39 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Tue, 27 May 2008 17:31:39 +0000
changeset 23368
76fd0254bae3
parent 23367
6de6bf268665
child 23369
3bdaaf15bfac

Prevent a crash when the imhtmltoolbar is disposed and the smiley dialog is open.

pidgin/gtkimhtmltoolbar.c file | annotate | diff | comparison | revisions
--- a/pidgin/gtkimhtmltoolbar.c	Tue May 27 10:39:37 2008 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Tue May 27 17:31:39 2008 +0000
@@ -1122,7 +1122,10 @@
 	}
 
 	destroy_toolbar_font(NULL, NULL, toolbar);
-	destroy_smiley_dialog(toolbar);
+	if (toolbar->smiley_dialog != NULL) {
+		g_signal_handlers_disconnect_by_func(G_OBJECT(toolbar->smiley_dialog), close_smiley_dialog, toolbar);
+		destroy_smiley_dialog(toolbar);
+	}
 	destroy_toolbar_bgcolor(NULL, NULL, toolbar);
 	destroy_toolbar_fgcolor(NULL, NULL, toolbar);
 	close_link_dialog(toolbar);

mercurial