Respect the user's desire to be prompted to confirm that he wants to

2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-callbacks.c (confirm_expunge): Respect the user's desire to
	be prompted to confirm that he wants to expunge the blasted
	folder. Also, don't set the usize - that's just an evil hack and
	you may find it will cut off text once the label has been
	translated.
	(create_msg_composer): In order for the security options to be
	checked when composing a new message, we must set the from account
	explicitly even though the composer hdrs sets the default from
	account and emits the signal because at that stage the composer
	hasn't yet connected to the signals and thus the bonobo menu items
	don't get set.

	* mail-config.c (mail_config_set_confirm_expunge): New.
	(mail_config_get_confirm_expunge): New.

svn path=/trunk/; revision=12141

1 files changed, 23 insertions, 2 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index f40d999b0a..2050da0e05 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -66,6 +66,7 @@ typedef struct {
 	guint32  citation_color;
 	gboolean prompt_empty_subject;
 	gboolean prompt_only_bcc;
+	gboolean confirm_expunge;
 	gboolean do_seen_timeout;
 	gint seen_timeout;
 	gboolean empty_trash_on_exit;
@@ -517,6 +518,10 @@ config_read (void)
 	config->prompt_only_bcc = bonobo_config_get_boolean_with_default (
 		config->db, "/Mail/Prompts/only_bcc", TRUE, NULL);
 	
+	/* Expunge */
+	config->confirm_expunge = bonobo_config_get_boolean_with_default (
+		config->db, "/Mail/Prompts/confirm_expunge", TRUE, NULL);
+	
 	/* PGP/GPG */
 	config->pgp_path = bonobo_config_get_string (config->db, 
 						     "/Mail/PGP/path", NULL);
@@ -786,11 +791,15 @@ mail_config_write_on_exit (void)
 	
 	/* Empty Subject */
 	bonobo_config_set_boolean (config->db, "/Mail/Prompts/empty_subject",
-				   config->prompt_empty_subject, NULL);	
+				   config->prompt_empty_subject, NULL);
 	
 	/* Only Bcc */
 	bonobo_config_set_boolean (config->db, "/Mail/Prompts/only_bcc",
-				   config->prompt_only_bcc, NULL);	
+				   config->prompt_only_bcc, NULL);
+	
+	/* Expunge */
+	bonobo_config_set_boolean (config->db, "/Mail/Prompts/confirm_expunge",
+				   config->confirm_expunge, NULL);
 	
 	/* PGP/GPG */
 	bonobo_config_set_string_wrapper (config->db, "/Mail/PGP/path", 
@@ -1144,6 +1153,18 @@ mail_config_set_prompt_only_bcc (gboolean value)
 	config->prompt_only_bcc = value;
 }
 
+gboolean
+mail_config_get_confirm_expunge (void)
+{
+	return config->confirm_expunge;
+}
+
+void
+mail_config_set_confirm_expunge (gboolean value)
+{
+	config->confirm_expunge = value;
+}
+
 
 struct {
 	char *bin;