# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1213844838 0
# Node ID ed346fedec3052318e1cdddbedd85a598c667a2e
# Parent  56c9176d21e4ec977224be7424927b078a8bcfc3
applied changes from 9ebef7dc91fd3f43f016ceeee02e0a15e2008868
             through 90044aa70ff85325bb4dd1102410046531721109

diff -r 56c9176d21e4 -r ed346fedec30 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Thu Jun 19 03:06:03 2008 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Thu Jun 19 03:07:18 2008 +0000
@@ -1004,7 +1004,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);