aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config.h
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-06-27 05:14:09 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-06-27 05:14:09 +0800
commit47400a031c1baef26a00584095ae647bc58dcecf (patch)
treeba062ffc93420ef045434d6507003e2eddd170c1 /mail/mail-config.h
parent26fb05c8cb7db57e500945ee5546e52363f2e4a6 (diff)
downloadgsoc2013-evolution-47400a031c1baef26a00584095ae647bc58dcecf.tar.gz
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-config.h')
-rw-r--r--mail/mail-config.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 47c6a293c5..af65127dff 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -31,6 +31,14 @@ extern "C" {
#pragma }
#endif /* __cplusplus */
+enum {
+ CONFIG_PGP_TYPE_NONE,
+ CONFIG_PGP_TYPE_PGP2, /* no longer supported */
+ CONFIG_PGP_TYPE_PGP5, /* no longer supported */
+ CONFIG_PGP_TYPE_PGP6, /* no longer supported */
+ CONFIG_PGP_TYPE_GPG
+};
+
typedef struct {
int id;
char *name;
@@ -217,10 +225,10 @@ void mail_config_set_confirm_goto_next_folder (gboolean value);
gboolean mail_config_get_goto_next_folder (void);
void mail_config_set_goto_next_folder (gboolean value);
-CamelPgpType mail_config_pgp_type_detect_from_path (const char *pgp);
+int mail_config_pgp_type_detect_from_path (const char *pgp);
-CamelPgpType mail_config_get_pgp_type (void);
-void mail_config_set_pgp_type (CamelPgpType pgp_type);
+int mail_config_get_pgp_type (void);
+void mail_config_set_pgp_type (int pgp_type);
const char *mail_config_get_pgp_path (void);
void mail_config_set_pgp_path (const char *pgp_path);