Fixed the "Read" to be Read in the glade file per menesis' request.

2001-07-23  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config.glade: Fixed the "Read" to be Read in the glade file
	per menesis' request.

	* mail-accounts.c (construct): Give the dialog a Close button
	instead of an OK button.
	(prompt_bcc_only_toggled): New.
	(threaded_list_toggled): New.
	(show_preview_toggled): New.
	(construct): Add code for the bcc-only-prompt, threaded-list, and
	show-preview checkboxes.

	* mail-ops.c (transfer_messages_transfer): If the source and
	destination folders are the same, just mark the uids as undeleted
	(in case they were marked as deleted before).

svn path=/trunk/; revision=11327

1 files changed, 34 insertions, 1 deletions

diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index d1abcb136d..5cdb5683a2 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -675,6 +675,24 @@ prompt_empty_subject_toggled (GtkWidget *toggle, gpointer data)
 }
 
 static void
+prompt_bcc_only_toggled (GtkWidget *toggle, gpointer data)
+{
+	mail_config_set_prompt_only_bcc (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
+}
+
+static void
+thread_list_toggled (GtkWidget *toggle, gpointer data)
+{
+	mail_config_set_thread_list (NULL, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
+}
+
+static void
+show_preview_toggled (GtkWidget *toggle, gpointer data)
+{
+	mail_config_set_show_preview (NULL, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
+}
+
+static void
 forward_style_activated (GtkWidget *item, gpointer data)
 {
 	int style = GPOINTER_TO_INT (data);
@@ -724,7 +742,7 @@ construct (MailAccountsDialog *dialog)
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Account Manager"));
 	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_OK);
+	gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE);
 	
 	dialog->mail_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts"));
 	gtk_signal_connect (GTK_OBJECT (dialog->mail_accounts), "select-row",
@@ -844,6 +862,21 @@ construct (MailAccountsDialog *dialog)
 	gtk_signal_connect (GTK_OBJECT (dialog->prompt_empty_subject), "toggled",
 			    GTK_SIGNAL_FUNC (prompt_empty_subject_toggled), dialog);
 	
+	dialog->prompt_bcc_only = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptBccOnly"));
+	gtk_toggle_button_set_active (dialog->prompt_bcc_only, mail_config_get_prompt_only_bcc ());
+	gtk_signal_connect (GTK_OBJECT (dialog->prompt_bcc_only), "toggled",
+			    GTK_SIGNAL_FUNC (prompt_bcc_only_toggled), dialog);
+	
+	dialog->thread_list = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkThreadList"));
+	gtk_toggle_button_set_active (dialog->thread_list, mail_config_get_thread_list (NULL));
+	gtk_signal_connect (GTK_OBJECT (dialog->thread_list), "toggled",
+			    GTK_SIGNAL_FUNC (thread_list_toggled), dialog);
+	
+	dialog->show_preview = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkShowPreview"));
+	gtk_toggle_button_set_active (dialog->show_preview, mail_config_get_show_preview (NULL));
+	gtk_signal_connect (GTK_OBJECT (dialog->show_preview), "toggled",
+			    GTK_SIGNAL_FUNC (show_preview_toggled), dialog);
+	
 	/* now to fill in the clists */
 	dialog->accounts_row = -1;
 	dialog->accounts = mail_config_get_accounts ();