From 93b4700f7dfcd1120db95ea2b7c31cf6a65c2502 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 18 Dec 2000 21:59:18 +0000 Subject: for now #ifdef PGP_PROGRAM falling back to handle_multipart_mixed. 2000-12-18 Chris Toshok * mail-format.c (handle_multipart_encrypted): for now #ifdef PGP_PROGRAM falling back to handle_multipart_mixed. (handle_multipart_signed): same. svn path=/trunk/; revision=7074 --- mail/ChangeLog | 6 ++++++ mail/mail-format.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/mail/ChangeLog b/mail/ChangeLog index 1ccf3e2da2..e7402b5263 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2000-12-18 Chris Toshok + + * mail-format.c (handle_multipart_encrypted): for now #ifdef + PGP_PROGRAM falling back to handle_multipart_mixed. + (handle_multipart_signed): same. + 2000-12-18 Dan Winship * message-list.c (hide_save_state): Unlock camel when done to diff --git a/mail/mail-format.c b/mail/mail-format.c index b63b9a8d3d..1576c261e4 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1199,6 +1199,7 @@ static gboolean handle_multipart_encrypted (CamelMimePart *part, const char *mime_type, MailDisplay *md) { +#ifdef PGP_PROGRAM CamelDataWrapper *wrapper; CamelMimePart *mime_part; CamelException ex; @@ -1223,6 +1224,9 @@ handle_multipart_encrypted (CamelMimePart *part, const char *mime_type, return retcode; } +#else + return handle_multipart_mixed (part, mime_type, md); +#endif } /* FIXME: So this function is mostly just a place-holder for now */ @@ -1230,6 +1234,7 @@ static gboolean handle_multipart_signed (CamelMimePart *part, const char *mime_type, MailDisplay *md) { +#ifdef PGP_PROGRAM CamelDataWrapper *wrapper; CamelException ex; gboolean valid; @@ -1245,6 +1250,9 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type, valid = pgp_mime_part_verify (part, &ex); return valid; +#else + return handle_multipart_mixed (part, mime_type, md); +#endif } /* As seen in RFC 2387! */ -- cgit v1.2.3