aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-accounts.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-12-11 04:09:37 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-12-11 04:09:37 +0800
commit63ce54907cd9f30f046e90be07ead0346ffe7154 (patch)
treeb7f6499cab389ca0e9eeed9b1d47a7046b77bfad /mail/mail-accounts.c
parent4996c3207568837e3d56fab16fb29719d3542d85 (diff)
downloadgsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.tar
gsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.tar.gz
gsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.tar.bz2
gsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.tar.lz
gsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.tar.xz
gsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.tar.zst
gsoc2013-evolution-63ce54907cd9f30f046e90be07ead0346ffe7154.zip
Make sure that the message subject is non-NULL beforetrying to base a
2001-12-04 Jeffrey Stedfast <fejj@ximian.com> * 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 <fejj@ximian.com> * 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
Diffstat (limited to 'mail/mail-accounts.c')
-rw-r--r--mail/mail-accounts.c20
1 files changed, 19 insertions, 1 deletions
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
@@ -764,6 +764,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)
{
GladeXML *gui;
@@ -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",