Mercurial > pidgin.yaz
comparison pidgin/gtkimhtmltoolbar.c @ 23227:1bdf8223ba45
Prevent a crash when the imhtmltoolbar is disposed and the smiley dialog is open.
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 27 May 2008 17:31:39 +0000 |
parents | 7dccb11c5f1d |
children | 3cc64898bdbd 0aa090fde749 |
comparison
equal
deleted
inserted
replaced
23226:e166f9e91d6d | 23227:1bdf8223ba45 |
---|---|
1120 gtk_widget_destroy(toolbar->image_dialog); | 1120 gtk_widget_destroy(toolbar->image_dialog); |
1121 toolbar->image_dialog = NULL; | 1121 toolbar->image_dialog = NULL; |
1122 } | 1122 } |
1123 | 1123 |
1124 destroy_toolbar_font(NULL, NULL, toolbar); | 1124 destroy_toolbar_font(NULL, NULL, toolbar); |
1125 destroy_smiley_dialog(toolbar); | 1125 if (toolbar->smiley_dialog != NULL) { |
1126 g_signal_handlers_disconnect_by_func(G_OBJECT(toolbar->smiley_dialog), close_smiley_dialog, toolbar); | |
1127 destroy_smiley_dialog(toolbar); | |
1128 } | |
1126 destroy_toolbar_bgcolor(NULL, NULL, toolbar); | 1129 destroy_toolbar_bgcolor(NULL, NULL, toolbar); |
1127 destroy_toolbar_fgcolor(NULL, NULL, toolbar); | 1130 destroy_toolbar_fgcolor(NULL, NULL, toolbar); |
1128 close_link_dialog(toolbar); | 1131 close_link_dialog(toolbar); |
1129 if (toolbar->imhtml) { | 1132 if (toolbar->imhtml) { |
1130 g_signal_handlers_disconnect_matched(toolbar->imhtml, | 1133 g_signal_handlers_disconnect_matched(toolbar->imhtml, |