aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-06-26 03:55:00 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-06-26 03:55:00 +0800
commit83f5888387c17fd95faf4c75117a5768ac7a4825 (patch)
tree0822cf6c1cf442d910c5cfb3476d62027b23d33c /mail/mail-config.c
parentc22378ec3d57a2d351d663819e2c3da97e81101f (diff)
downloadgsoc2013-evolution-83f5888387c17fd95faf4c75117a5768ac7a4825.tar.gz
gsoc2013-evolution-83f5888387c17fd95faf4c75117a5768ac7a4825.tar.zst
gsoc2013-evolution-83f5888387c17fd95faf4c75117a5768ac7a4825.zip
Some compiler warning fixes.
2002-06-25 Jeffrey Stedfast <fejj@ximian.com> * component-factory.c (mail_add_storage): Some compiler warning fixes. * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Removed. (mail_crypto_get_pgp_cipher_context): New convenience function to construct a pgp cipher context. (mail_crypto_pgp_mime_part_verify): Use the new get_pgp_cipher_context function. (mail_crypto_pgp_mime_part_encrypt): Same. (mail_crypto_pgp_mime_part_decrypt): Here too. * mail-account-gui.c (mail_account_gui_new): Initialise the pgp_always_trust checkbox. (mail_account_gui_save): Get whether or not to always_trust the user's pgp keys. * mail-config.c (account_copy): Copy over the pgp_always_trust option. (config_read): Read in the always_trust option. (mail_config_write): Save the always_trust option. svn path=/trunk/; revision=17277
Diffstat (limited to 'mail/mail-config.c')
-rw-r--r--mail/mail-config.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 033f9d646f..4c2192cf40 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -265,6 +265,7 @@ account_copy (const MailConfigAccount *account)
new->pgp_key = g_strdup (account->pgp_key);
new->pgp_encrypt_to_self = account->pgp_encrypt_to_self;
new->pgp_always_sign = account->pgp_always_sign;
+ new->pgp_always_trust = account->pgp_always_trust;
new->smime_key = g_strdup (account->smime_key);
new->smime_encrypt_to_self = account->smime_encrypt_to_self;
@@ -685,6 +686,11 @@ config_read (void)
config->db, path, TRUE, NULL);
g_free (path);
+ path = g_strdup_printf ("/Mail/Accounts/account_pgp_always_trust_%d", i);
+ account->pgp_always_trust = bonobo_config_get_boolean_with_default (
+ config->db, path, FALSE, NULL);
+ g_free (path);
+
/* get the s/mime info */
path = g_strdup_printf ("/Mail/Accounts/account_smime_key_%d", i);
val = bonobo_config_get_string (config->db, path, NULL);
@@ -1087,6 +1093,10 @@ mail_config_write (void)
account->pgp_encrypt_to_self, NULL);
g_free (path);
+ path = g_strdup_printf ("/Mail/Accounts/account_pgp_always_trust_%d", i);
+ bonobo_config_set_boolean (config->db, path, account->pgp_always_trust, NULL);
+ g_free (path);
+
/* account s/mime options */
path = g_strdup_printf ("/Mail/Accounts/account_smime_key_%d", i);
bonobo_config_set_string_wrapper (config->db, path, account->smime_key, NULL);