diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-06-27 05:14:09 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-06-27 05:14:09 +0800 |
| commit | 47400a031c1baef26a00584095ae647bc58dcecf (patch) | |
| tree | ba062ffc93420ef045434d6507003e2eddd170c1 /mail/mail-preferences.c | |
| parent | 26fb05c8cb7db57e500945ee5546e52363f2e4a6 (diff) | |
| download | gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar.gz gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar.bz2 gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar.lz gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar.xz gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar.zst gsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.zip | |
Don't allow the pgp type to be anything except NONE or GPG.
2002-06-26 Jeffrey Stedfast <fejj@ximian.com>
* mail-config.c (config_read): Don't allow the pgp type to be
anything except NONE or GPG.
* mail-preferences.c (mail_preferences_apply): Don't allow someone
to use anything other than GnuPG.
* mail-crypto.c (mail_crypto_get_pgp_cipher_context): No need to
handle pgp5 or pgp6 types anymore since we are no longer
supporting them. Ding dong the witch is dead!
* mail-format.c (handle_multipart_encrypted): Rewritten to use
camel_multipart_encrypted_decrypt.
* mail-crypto.c (mail_crypto_pgp_mime_part_verify): Removed.
(mail_crypto_pgp_mime_part_encrypt): Removed.
(mail_crypto_pgp_mime_part_decrypt): Are we seeing a trend yet?
svn path=/trunk/; revision=17301
Diffstat (limited to 'mail/mail-preferences.c')
| -rw-r--r-- | mail/mail-preferences.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c index 949fefc7f4..99599df888 100644 --- a/mail/mail-preferences.c +++ b/mail/mail-preferences.c @@ -356,7 +356,7 @@ void mail_preferences_apply (MailPreferences *prefs) { GtkWidget *entry, *menu; - CamelPgpType type; + int pgp_type; char *string; guint32 rgb; int i, val; @@ -414,9 +414,11 @@ mail_preferences_apply (MailPreferences *prefs) entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prefs->notify_sound_file)); string = gtk_entry_get_text (GTK_ENTRY (entry)); - type = string && *string ? mail_config_pgp_type_detect_from_path (string) : CAMEL_PGP_TYPE_NONE; - mail_config_set_pgp_path (string && *string ? string : NULL); - mail_config_set_pgp_type (type); + pgp_type = string && *string ? mail_config_pgp_type_detect_from_path (string) : CONFIG_PGP_TYPE_NONE; + if (pgp_type == CONFIG_PGP_TYPE_GPG) { + mail_config_set_pgp_path (string && *string ? string : NULL); + mail_config_set_pgp_type (pgp_type); + } /* Labels and Colours */ for (i = 0; i < 5; i++) { |