diff options
| author | Chris Toshok <toshok@ximian.com> | 2003-11-27 05:51:40 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2003-11-27 05:51:40 +0800 |
| commit | 7abb26b3fb954e44f5bfcda777ac0aa24dbf6fee (patch) | |
| tree | 7b7662d400403ea5811e527aaa4b21cfd7612298 /composer | |
| parent | 01815df69498bc8385a53534b33109afbb1939fa (diff) | |
| download | gsoc2013-evolution-7abb26b3fb954e44f5bfcda777ac0aa24dbf6fee.tar.gz gsoc2013-evolution-7abb26b3fb954e44f5bfcda777ac0aa24dbf6fee.tar.zst gsoc2013-evolution-7abb26b3fb954e44f5bfcda777ac0aa24dbf6fee.zip | |
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
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 ) { |