aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 8cd8ef3d37..1c06133db3 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-10 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (build_message): Wrap the S/MIME code in ifdef
+ SMIME_SUPPORTED which isn't defined but by some later version will
+ be.
+ (setup_ui): And again here.
+
2001-09-09 Maciej Stachowiak <mjs@noisehavoc.org>
* Makefile.am: Add VFS_CFLAGS so things don't break when the
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 200205a1ad..733fc6e363 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -511,7 +511,7 @@ build_message (EMsgComposer *composer)
camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
camel_object_unref (CAMEL_OBJECT (current));
-#ifdef HAVE_NSS
+#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
if (composer->smime_sign) {
CamelInternetAddress *from = NULL;
CamelMimeMessage *smime_mesg;
@@ -1798,7 +1798,7 @@ setup_ui (EMsgComposer *composer)
composer->uic, "SecurityPGPEncrypt",
menu_security_pgp_encrypt_cb, composer);
-#ifdef HAVE_NSS
+#if defined(HAVE_NSS) && defined(SMIME_SUPPORTED)
hide_smime = FALSE;
#else
hide_smime = TRUE;