From 63ce54907cd9f30f046e90be07ead0346ffe7154 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 10 Dec 2001 20:09:37 +0000 Subject: Make sure that the message subject is non-NULL beforetrying to base a 2001-12-04 Jeffrey Stedfast * mail-autofilter.c (rule_from_message): Make sure that the message subject is non-NULL beforetrying to base a vfolder rule off it. Fixes bug #16284. 2001-12-07 Jeffrey Stedfast * mail-accounts.c (construct): Connect to the dialog's "destroy" event and close any druids/editors that may be open when that signal is caught. Fixes bug #16501. * mail-vfolder.c (vfolder_edit): Set the window title to "Virtual Folders". Fixes bug #16695. svn path=/trunk/; revision=14966 --- mail/mail-accounts.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'mail/mail-accounts.c') diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 5d7945c614..2b386e1b11 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -763,6 +763,21 @@ charset_menu_deactivate (GtkWidget *menu, gpointer data) } } +static void +dialog_destroy (GtkWidget *dialog, gpointer user_data) +{ + if (druid) + gtk_widget_destroy (GTK_WIDGET (druid)); + + if (editor) + gtk_widget_destroy (GTK_WIDGET (editor)); + +#ifdef ENABLE_NNTP + if (news_editor) + gtk_widget_destroy (GTK_WIDGET (news_editor)); +#endif +} + static void construct (MailAccountsDialog *dialog) { @@ -783,7 +798,10 @@ construct (MailAccountsDialog *dialog) gtk_window_set_title (GTK_WINDOW (dialog), _("Mail Settings")); gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300); - gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE); + gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_OK); + + gtk_signal_connect (GTK_OBJECT (dialog), "destroy", + GTK_SIGNAL_FUNC (dialog_destroy), dialog); dialog->mail_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts")); gtk_signal_connect (GTK_OBJECT (dialog->mail_accounts), "select-row", -- cgit v1.2.3