diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-02-20 10:33:30 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-02-20 10:33:30 +0800 |
| commit | 353d5428a9a97cf3d2a74bcef5ce19647e12eae7 (patch) | |
| tree | a5d8f785eb5eda52d47fdbbc6e57ac4d58f8bde3 /mail | |
| parent | 3f97ed4a4720d7467a99c261f5355b35a677102d (diff) | |
| download | gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.tar gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.tar.gz gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.tar.bz2 gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.tar.lz gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.tar.xz gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.tar.zst gsoc2013-evolution-353d5428a9a97cf3d2a74bcef5ce19647e12eae7.zip | |
wrap code with ENABLE_SMIME instead of HAVE_NSS. (emf_multipart_signed):
2004-02-19 Chris Toshok <toshok@ximian.com>
* em-format.c (emf_application_xpkcs7mime): wrap code with
ENABLE_SMIME instead of HAVE_NSS.
(emf_multipart_signed): same.
(type_builtin_table): same.
svn path=/trunk/; revision=24811
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-format.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 50ae3a4e1f..7822da91c5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-02-19 Chris Toshok <toshok@ximian.com> + + * em-format.c (emf_application_xpkcs7mime): wrap code with + ENABLE_SMIME instead of HAVE_NSS. + (emf_multipart_signed): same. + (type_builtin_table): same. + 2004-02-19 Rodney Dawes <dobey@ximian.com> * em-folder-tree.c (emft_save_state): Revert previous change, doh diff --git a/mail/em-format.c b/mail/em-format.c index 816b2f7c25..c3194566d2 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -1022,7 +1022,7 @@ emf_snoop_part(CamelMimePart *part) see bug #11778 for some discussion */ } -#ifdef HAVE_NSS +#ifdef ENABLE_SMIME static void emf_application_xpkcs7mime(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) { @@ -1299,7 +1299,7 @@ emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co /* FIXME: Should be done via a plugin interface */ /* FIXME: duplicated in em-format-html-display.c */ -#ifdef HAVE_NSS +#ifdef ENABLE_SMIME if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0 || g_ascii_strcasecmp("application/pkcs7-signature", mps->protocol) == 0) cipher = camel_smime_context_new(emf->session); @@ -1346,7 +1346,7 @@ emf_message_rfc822(EMFormat *emf, CamelStream *stream, CamelMimePart *part, cons } static EMFormatHandler type_builtin_table[] = { -#ifdef HAVE_NSS +#ifdef ENABLE_SMIME { "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, #endif { "multipart/alternative", emf_multipart_alternative }, @@ -1361,7 +1361,7 @@ static EMFormatHandler type_builtin_table[] = { { "message/*", emf_message_rfc822, EM_FORMAT_HANDLER_INLINE }, /* Insert brokenly-named parts here */ -#ifdef HAVE_NSS +#ifdef ENABLE_SMIME { "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION }, #endif |