Mercurial > pidgin
changeset 8784:48dd097eb475
[gaim-migrate @ 9546]
Dialogs opened from a conversation window are now closed when the
conversation window is closed, preventing a crash. Patch by Kevin Stange.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Fri, 23 Apr 2004 23:35:55 +0000 |
| parents | ab295b8a95a0 |
| children | a871dec1c9d6 |
| files | ChangeLog src/gtkimhtmltoolbar.c |
| diffstat | 2 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 23 23:23:49 2004 +0000 +++ b/ChangeLog Fri Apr 23 23:35:55 2004 +0000 @@ -8,6 +8,8 @@ Bug Fixes: * Gadu-Gadu updates (Andrew Wellington) * Compiles again with gcc 2.96 (Ignacio J. Elia) + * Dialogs opened from a conversation window are now closed when + the conversation window is closed, preventing a crash (Kevin Stange) version 0.77 (04/22/2004): New Features:
--- a/src/gtkimhtmltoolbar.c Fri Apr 23 23:23:49 2004 +0000 +++ b/src/gtkimhtmltoolbar.c Fri Apr 23 23:35:55 2004 +0000 @@ -747,24 +747,18 @@ { GtkIMHtmlToolbar *toolbar = GTK_IMHTMLTOOLBAR(object); - if (toolbar->smiley_dialog != NULL) - { - gtk_widget_destroy(toolbar->smiley_dialog); - toolbar->smiley_dialog = NULL; - } - - if (toolbar->link_dialog != NULL) - { - gaim_request_close(GAIM_REQUEST_FIELDS, toolbar->link_dialog); - toolbar->link_dialog = NULL; - } - if (toolbar->image_dialog != NULL) { gtk_widget_destroy(toolbar->image_dialog); toolbar->image_dialog = NULL; } + close_link_dialog(toolbar); + close_smiley_dialog(NULL, NULL, toolbar); + destroy_toolbar_font(NULL, NULL, toolbar); + destroy_toolbar_fgcolor(NULL, NULL, toolbar); + destroy_toolbar_bgcolor(NULL, NULL, toolbar); + if (toolbar->sml) free(toolbar->sml); gtk_object_sink(GTK_OBJECT(toolbar->tooltips));