# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1130414417 0
# Node ID dc51cdcb648e8cad2f05fa4a97aa30217b0274cd
# Parent  434181b96f444f35e8e3c1836c831f3aabd6ab10
[gaim-migrate @ 14140]
sf patch #1339135, from Sadrul Habib Chowdhury

Hi. Bleeter found this bug:

(1) open up some conversation window
(2) open the smiley dialog
(3) close the conversation window. the smiley dialog
remains open
(4) select some smiley
(5) Gaim crashes

This patch fixes this crash. It shouldn't cause any
probs with regards to gtk-version-checking. The other
code handling the smiley-dialog doesn't do the
version-checking, so this shouldn't be necessary either.

committer: Tailor Script <tailor@pidgin.im>

diff -r 434181b96f44 -r dc51cdcb648e src/gtkimhtmltoolbar.c
--- a/src/gtkimhtmltoolbar.c	Thu Oct 27 04:56:33 2005 +0000
+++ b/src/gtkimhtmltoolbar.c	Thu Oct 27 12:00:17 2005 +0000
@@ -866,9 +866,7 @@
 	}
 
 	destroy_toolbar_font(NULL, NULL, toolbar);
-#if !GTK_CHECK_VERSION(2,4,0) /* Smiley selection menu */
 	destroy_smiley_dialog(toolbar);
-#endif
 	destroy_toolbar_bgcolor(NULL, NULL, toolbar);
 	destroy_toolbar_fgcolor(NULL, NULL, toolbar);
 	close_link_dialog(toolbar);