From ed88f237863dc3dd5aec568196b61008df2e9b8c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 11 Aug 2000 20:27:12 +0000 Subject: Update this for CamelObject (try_inline_pgp): Deal with decrypting here * mail-format.c (destroy_part): Update this for CamelObject (try_inline_pgp): Deal with decrypting here rather than trying to pawn the data off to handle_multipart_encrypted, since it most likely won't be correct (won't have the proper MIME headers inside the encrypted part). (handle_multipart_encrypted): Add code from Nathan Thompson-Amato to re-MIME-parse the decrypted data after decrypting. * mail-crypto.c (mail_crypto_openpgp_{de,en}crypt): Get the password here rather than having it passed in. Remove some dead code. * session.c (mail_request_dialog): Allow this to work in either a sync or an async context. svn path=/trunk/; revision=4751 --- mail/mail.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/mail.h') diff --git a/mail/mail.h b/mail/mail.h index 9e0e19e1ce..8099948c17 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -37,12 +37,10 @@ void mail_config_druid (void); /* mail-crypto */ char *mail_crypto_openpgp_decrypt (const char *ciphertext, - const char *passphrase, CamelException *ex); char *mail_crypto_openpgp_encrypt (const char *plaintext, const GPtrArray *recipients, - const char *passphrase, gboolean sign, CamelException *ex); /* FIXME: add encryption & signing functions */ @@ -93,6 +91,8 @@ GtkWidget *mail_view_create (CamelFolder *source, const char *uid, CamelMimeMess /* session */ void session_init (void); -char *mail_request_dialog (const char *prompt, gboolean secret, const char *key); -void forget_passwords (BonoboUIHandler *uih, void *user_data, const char *path); +char *mail_request_dialog (const char *prompt, gboolean secret, + const char *key, gboolean async); +void forget_passwords (BonoboUIHandler *uih, void *user_data, + const char *path); extern CamelSession *session; -- cgit v1.2.3