From 7abb26b3fb954e44f5bfcda777ac0aa24dbf6fee Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 26 Nov 2003 21:51:40 +0000 Subject: switch from just checking SMIME_SUPPORTED to checking both HAVE_NSS and 2003-11-26 Chris Toshok * e-msg-composer.c (build_message): switch from just checking SMIME_SUPPORTED to checking both HAVE_NSS and SMIME_SUPPORTED. svn path=/trunk/; revision=23497 --- composer/e-msg-composer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 60c65ca9d7..a9a630ae87 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -86,7 +86,7 @@ #include #include #include -#ifdef SMIME_SUPPORTED +#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED) #include #endif @@ -551,7 +551,7 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data) /* Setup working recipient list if we're encrypting */ if (composer->pgp_encrypt -#ifdef SMIME_SUPPORTED +#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED) || composer->smime_encrypt #endif ) { -- cgit v1.2.3