pidgin: 90044aa7: Prevent a crash when the imhtmltoolbar i...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 90044aa70ff85325bb4dd1102410046531721109
Ancestor: 9ebef7dc91fd3f43f016ceeee02e0a15e2008868
Author: datallah at pidgin.im
Date: 2008-05-27T17:31:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90044aa70ff85325bb4dd1102410046531721109

Modified files:
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- pidgin/gtkimhtmltoolbar.c	30d9ead2f93eeaeb02d6e6128dbe9578a271f533
+++ pidgin/gtkimhtmltoolbar.c	b9753aad4bcacff9c60798aec69e3e4d47c000b2
@@ -1122,7 +1122,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);