From f06f7a283659fa559e5377d015af65658ef73717 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 26 Sep 2001 00:09:09 +0000 Subject: Update to not send the remember-passphrase option to the context, it 2001-09-25 Jeffrey Stedfast * 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 --- mail/mail-config.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'mail/mail-config.c') 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) { -- cgit v1.2.3