From 7abb26b3fb954e44f5bfcda777ac0aa24dbf6fee Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
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  <toshok@ximian.com>

	* 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/ChangeLog        | 5 +++++
 composer/e-msg-composer.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/composer/ChangeLog b/composer/ChangeLog
index cda4e8fca7..f16791ccfb 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-26  Chris Toshok  <toshok@ximian.com>
+
+	* e-msg-composer.c (build_message): switch from just checking
+	SMIME_SUPPORTED to checking both HAVE_NSS and SMIME_SUPPORTED.
+
 2003-11-26  JP Rosevear  <jpr@ximian.com>
 
 	* Makefile.am: turn on deprecated gtk widgets
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 <camel/camel-charset-map.h>
 #include <camel/camel-stream-filter.h>
 #include <camel/camel-mime-filter-charset.h>
-#ifdef SMIME_SUPPORTED
+#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
 #include <camel/camel-smime-context.h>
 #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