Update to not send the remember-passphrase option to the context, it

2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-format.c (decode_pgp): Update to not send the
	remember-passphrase option to the context, it doesn't need it
	anymore.
	(try_inline_pgp_sig): Same.

	* mail-accounts.c (construct): The remember-passphrase option is
	no longer there. This can now be set on the passphrase prompt
	dialog.
	(construct): Add confirm expunge options.

	* mail-config.c (config_read): We no longer read-in the
	remember-passphrase state because we no longer need it.
	(mail_config_write_on_exit): We no longer save it either.
	(mail_config_get_remember_pgp_passphrase): Removed.
	(mail_config_set_remember_pgp_passphrase): Removed.

	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): No longer do we
	need to send the remember passphrase state to the pgp context.
	(mail_crypto_pgp_mime_part_verify): Same.
	(mail_crypto_pgp_mime_part_encrypt): Here too.
	(mail_crypto_pgp_mime_part_decrypt): And here.

svn path=/trunk/; revision=13139

8 files changed, 56 insertions, 60 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index ddc44f81d1..629cbb4bd8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,27 @@
+2001-09-25  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-format.c (decode_pgp): Update to not send the
+	remember-passphrase option to the context, it doesn't need it
+	anymore.
+	(try_inline_pgp_sig): Same.
+
+	* mail-accounts.c (construct): The remember-passphrase option is
+	no longer there. This can now be set on the passphrase prompt
+	dialog.
+	(construct): Add confirm expunge options.
+
+	* mail-config.c (config_read): We no longer read-in the
+	remember-passphrase state because we no longer need it.
+	(mail_config_write_on_exit): We no longer save it either.
+	(mail_config_get_remember_pgp_passphrase): Removed.
+	(mail_config_set_remember_pgp_passphrase): Removed.
+
+	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): No longer do we
+	need to send the remember passphrase state to the pgp context.
+	(mail_crypto_pgp_mime_part_verify): Same.
+	(mail_crypto_pgp_mime_part_encrypt): Here too.
+	(mail_crypto_pgp_mime_part_decrypt): And here.
+
 2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
 
 	[Patch for Automake 1.5 compatibility pointed out by Richard
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 5e3086182d..15228dc61a 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -672,12 +672,6 @@ empty_trash_toggled (GtkWidget *toggle, gpointer data)
 }
 
 static void
-remember_pgp_passphrase_toggled (GtkWidget *toggle, gpointer data)
-{
-	mail_config_set_remember_pgp_passphrase (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
-}
-
-static void
 prompt_empty_subject_toggled (GtkWidget *toggle, gpointer data)
 {
 	mail_config_set_prompt_empty_subject (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
@@ -708,6 +702,12 @@ filter_log_toggled (GtkWidget *toggle, gpointer data)
 }
 
 static void
+confirm_expunge_toggled (GtkWidget *toggle, gpointer data)
+{
+	mail_config_set_confirm_expunge (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
+}
+
+static void
 forward_style_activated (GtkWidget *item, gpointer data)
 {
 	int style = GPOINTER_TO_INT (data);
@@ -876,11 +876,6 @@ construct (MailAccountsDialog *dialog)
 	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->pgp_path)),
 			    "changed", GTK_SIGNAL_FUNC (pgp_path_changed), dialog);
 	
-	dialog->remember_passwd = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkRememberPGPPassphrase"));
-	gtk_toggle_button_set_active (dialog->remember_passwd, mail_config_get_remember_pgp_passphrase ());
-	gtk_signal_connect (GTK_OBJECT (dialog->remember_passwd), "toggled",
-			    GTK_SIGNAL_FUNC (remember_pgp_passphrase_toggled), dialog);
-	
 	dialog->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
 	menu = e_charset_picker_new (mail_config_get_default_charset ());
 	gtk_option_menu_set_menu (dialog->charset, GTK_WIDGET (menu));
@@ -904,6 +899,11 @@ construct (MailAccountsDialog *dialog)
 	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->filter_log_path)),
 			    "changed", GTK_SIGNAL_FUNC (filter_log_path_changed), dialog);
 	
+	dialog->confirm_expunge = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkConfirmExpunge"));
+	gtk_toggle_button_set_active (dialog->confirm_expunge, mail_config_get_confirm_expunge ());
+	gtk_signal_connect (GTK_OBJECT (dialog->confirm_expunge), "toggled",
+			    GTK_SIGNAL_FUNC (confirm_expunge_toggled), dialog);
+	
 	/* now to fill in the clists */
 	dialog->accounts_row = -1;
 	dialog->accounts = mail_config_get_accounts ();
diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h
index 67f7322caf..38cc82e043 100644
--- a/mail/mail-accounts.h
+++ b/mail/mail-accounts.h
@@ -91,10 +91,10 @@ struct _MailAccountsDialog {
 	GtkToggleButton *empty_trash;
 	GtkToggleButton *filter_log;
 	GnomeFileEntry *filter_log_path;
+	GtkToggleButton *confirm_expunge;
 	
 	/* PGP page */
 	GnomeFileEntry *pgp_path;
-	GtkToggleButton *remember_passwd;
 
 	/* Pixmaps for the clist */
 	GdkPixmap *mark_pixmap;
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 0eef9edf16..c1931fcb1a 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -82,7 +82,6 @@ typedef struct {
 	
 	char *pgp_path;
 	CamelPgpType pgp_type;
-	gboolean remember_pgp_passphrase;
 	
 	MailConfigHTTPMode http_mode;
 	MailConfigForwardStyle default_forward_style;
@@ -554,9 +553,6 @@ config_read (void)
 	config->pgp_type = bonobo_config_get_long_with_default (config->db, 
 	        "/Mail/PGP/type", CAMEL_PGP_TYPE_NONE, NULL);
 	
-	config->remember_pgp_passphrase = bonobo_config_get_boolean_with_default (
-		config->db, "/Mail/Prompts/remember_passphrase", TRUE, NULL);
-	
 	/* HTTP images */
 	config->http_mode = bonobo_config_get_long_with_default (config->db, 
 		"/Mail/Display/http_images", MAIL_CONFIG_HTTP_SOMETIMES, NULL);
@@ -845,9 +841,6 @@ mail_config_write_on_exit (void)
 	bonobo_config_set_long (config->db, "/Mail/PGP/type", 
 				config->pgp_type, NULL);
 	
-	bonobo_config_set_boolean (config->db, "/Mail/Prompts/remember_passphrase",
-				   config->remember_pgp_passphrase, NULL);	
-	
 	/* HTTP images */
 	bonobo_config_set_long (config->db, "/Mail/Display/http_images", 
 				config->http_mode, NULL);
@@ -1322,18 +1315,6 @@ mail_config_set_pgp_path (const char *pgp_path)
 	config->pgp_path = g_strdup (pgp_path);
 }
 
-gboolean
-mail_config_get_remember_pgp_passphrase (void)
-{
-	return config->remember_pgp_passphrase;
-}
-
-void
-mail_config_set_remember_pgp_passphrase (gboolean value)
-{
-	config->remember_pgp_passphrase = value;
-}
-
 MailConfigHTTPMode
 mail_config_get_http_mode (void)
 {
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 42ad7ba248..0a64b23478 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2932,20 +2932,6 @@ Quoted
       </widget>
 
       <widget>
-	<class>GtkCheckButton</class>
-	<name>chkRememberPGPPassphrase</name>
-	<can_focus>True</can_focus>
-	<label>_Remember PGP Passphrase until exit</label>
-	<active>True</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
 	<class>GtkHBox</class>
 	<name>hbox56</name>
 	<homogeneous>False</homogeneous>
@@ -3052,6 +3038,20 @@ Quoted
 	  </widget>
 	</widget>
       </widget>
+
+      <widget>
+	<class>GtkCheckButton</class>
+	<name>chkConfirmExpunge</name>
+	<can_focus>True</can_focus>
+	<label>Confirm when Expunging a folder</label>
+	<active>False</active>
+	<draw_indicator>True</draw_indicator>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
     </widget>
 
     <widget>
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 141c2bba22..6de85b5049 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -161,9 +161,6 @@ void         mail_config_set_pgp_type (CamelPgpType pgp_type);
 const char *mail_config_get_pgp_path (void);
 void        mail_config_set_pgp_path (const char *pgp_path);
 
-gboolean    mail_config_get_remember_pgp_passphrase (void);
-void        mail_config_set_remember_pgp_passphrase (gboolean value);
-
 MailConfigHTTPMode mail_config_get_http_mode (void);
 void               mail_config_set_http_mode (MailConfigHTTPMode);
 
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 2028e5bf28..bad81e5539 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -49,8 +49,7 @@ mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part, const char *userid, C
 	CamelPgpContext *context;
 	
 	context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-					 mail_config_get_pgp_path (),
-					 mail_config_get_remember_pgp_passphrase ());
+					 mail_config_get_pgp_path ());
 	
 	if (context) {
 		camel_pgp_mime_part_sign (context, mime_part, userid, hash, ex);
@@ -75,8 +74,7 @@ mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
 	CamelPgpContext *context;
 	
 	context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-					 mail_config_get_pgp_path (),
-					 mail_config_get_remember_pgp_passphrase ());
+					 mail_config_get_pgp_path ());
 	
 	if (context) {
 		valid = camel_pgp_mime_part_verify (context, mime_part, ex);
@@ -105,8 +103,7 @@ mail_crypto_pgp_mime_part_encrypt (CamelMimePart **mime_part, GPtrArray *recipie
 	CamelPgpContext *context;
 	
 	context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-					 mail_config_get_pgp_path (),
-					 mail_config_get_remember_pgp_passphrase ());
+					 mail_config_get_pgp_path ());
 	
 	if (context) {
 		camel_pgp_mime_part_encrypt (context, mime_part, recipients, ex);
@@ -131,8 +128,7 @@ mail_crypto_pgp_mime_part_decrypt (CamelMimePart *mime_part, CamelException *ex)
 	CamelMimePart *part = NULL;
 	
 	context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-					 mail_config_get_pgp_path (),
-					 mail_config_get_remember_pgp_passphrase ());
+					 mail_config_get_pgp_path ());
 	
 	if (context) {
 		part = camel_pgp_mime_part_decrypt (context, mime_part, ex);
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 584db2b01c..f76431bbda 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1340,8 +1340,7 @@ decode_pgp (CamelStream *ciphertext, CamelStream *plaintext, MailDisplay *md)
 		CamelPgpContext *ctx;
 		
 		ctx = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-					     mail_config_get_pgp_path (),
-					     mail_config_get_remember_pgp_passphrase ());
+					     mail_config_get_pgp_path ());
 		
 		if (ctx) {
 			camel_pgp_decrypt (ctx, ciphertext, plaintext, &ex);
@@ -1500,8 +1499,7 @@ try_inline_pgp_sig (char *start, CamelMimePart *part, MailDisplay *md)
 	mail_html_write (md->html, md->stream, "<hr>");
 	
 	context = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-					 mail_config_get_pgp_path (),
-					 mail_config_get_remember_pgp_passphrase ());
+					 mail_config_get_pgp_path ());
 	
 	if (context) {
 		CamelMimeFilterCharset *charset_filter;