pidgin.2.4.3: b8bd9b17: applied changes from 9ebef7dc91fd3f43f01...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: b8bd9b176d317137a154983e390212e42020e29f
Ancestor: ae409bfc91960fc1a57e4ed3ef60b1741275aba4
Author: datallah at pidgin.im
Date: 2008-06-19T03:07:18
Branch: im.pidgin.pidgin.2.4.3
URL: http://d.pidgin.im/viewmtn/revision/info/b8bd9b176d317137a154983e390212e42020e29f

Modified files:
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

applied changes from 9ebef7dc91fd3f43f016ceeee02e0a15e2008868
             through 90044aa70ff85325bb4dd1102410046531721109

-------------- next part --------------
============================================================
--- pidgin/gtkimhtmltoolbar.c	bb0f6cb4e8a66237645d15ecb440332f6444b5b6
+++ pidgin/gtkimhtmltoolbar.c	79d71897ad192a7de4f18c616222cfd18c83a83e
@@ -1004,7 +1004,10 @@ gtk_imhtmltoolbar_finalize (GObject *obj
 	}
 
 	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);