# HG changeset patch # User Daniel Atallah # Date 1211909499 0 # Node ID 1bdf8223ba45048cd423ed1a9cfae1d42f369c47 # Parent e166f9e91d6dcb1e129e1ce5e675c8326bfec048 Prevent a crash when the imhtmltoolbar is disposed and the smiley dialog is open. diff -r e166f9e91d6d -r 1bdf8223ba45 pidgin/gtkimhtmltoolbar.c --- 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);