aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-config.c18
2 files changed, 24 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 69d879264c..56b60e02d3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-config.c (mail_config_write): Save the always-sign options
+ for pgp and smime.
+ (config_read): Read in the always-save options for pgp and smime.
+
2001-08-17 Christopher James Lahey <clahey@ximian.com>
* message-list.etspec: Made the default values for column
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 576bea2038..6a2e8e5e6a 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -342,6 +342,11 @@ config_read (void)
else
g_free (val);
+ path = g_strdup_printf ("/Mail/Accounts/account_pgp_always_sign_%d", i);
+ account->pgp_always_sign = bonobo_config_get_boolean_with_default (
+ config->db, path, TRUE, NULL);
+ g_free (path);
+
path = g_strdup_printf ("/Mail/Accounts/account_pgp_encrypt_to_self_%d", i);
account->pgp_encrypt_to_self = bonobo_config_get_boolean_with_default (
config->db, path, TRUE, NULL);
@@ -356,6 +361,11 @@ config_read (void)
else
g_free (val);
+ path = g_strdup_printf ("/Mail/Accounts/account_smime_always_sign_%d", i);
+ account->smime_always_sign = bonobo_config_get_boolean_with_default (
+ config->db, path, TRUE, NULL);
+ g_free (path);
+
path = g_strdup_printf ("/Mail/Accounts/account_smime_encrypt_to_self_%d", i);
account->smime_encrypt_to_self = bonobo_config_get_boolean_with_default (
config->db, path, TRUE, NULL);
@@ -635,6 +645,10 @@ mail_config_write (void)
bonobo_config_set_string_wrapper (config->db, path, account->pgp_key, NULL);
g_free (path);
+ path = g_strdup_printf ("/Mail/Accounts/account_pgp_always_sign_%d", i);
+ bonobo_config_set_boolean (config->db, path, account->pgp_always_sign, NULL);
+ g_free (path);
+
path = g_strdup_printf ("/Mail/Accounts/account_pgp_encrypt_to_self_%d", i);
bonobo_config_set_boolean (config->db, path,
account->pgp_encrypt_to_self, NULL);
@@ -645,6 +659,10 @@ mail_config_write (void)
bonobo_config_set_string_wrapper (config->db, path, account->smime_key, NULL);
g_free (path);
+ path = g_strdup_printf ("/Mail/Accounts/account_smime_always_sign_%d", i);
+ bonobo_config_set_boolean (config->db, path, account->smime_always_sign, NULL);
+ g_free (path);
+
path = g_strdup_printf ("/Mail/Accounts/account_smime_encrypt_to_self_%d", i);
bonobo_config_set_boolean (config->db, path, account->smime_encrypt_to_self, NULL);
g_free (path);