From 085a0fa503b9d3507a014d6a7a7ac3c2479896e2 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 10 Sep 2008 13:11:11 +0000
Subject: ** Fixes bug #551548

2008-09-10  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #551548

	* composer/e-msg-composer.c:
	* composer/e-composer-action.c:
	Remove pointless SMIME_SUPPORTED check, which was hard-coded to 1.


svn path=/trunk/; revision=36294
---
 composer/ChangeLog            |  8 ++++++++
 composer/e-composer-actions.c |  2 +-
 composer/e-msg-composer.c     | 10 ++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'composer')

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 84780f5d66..7afbe38079 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-10  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #551548
+
+	* e-msg-composer.c:
+	* e-composer-action.c:
+	Remove pointless SMIME_SUPPORTED check, which was hard-coded to 1.
+
 2008-09-02  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index e16a207005..3146d9614b 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -698,7 +698,7 @@ e_composer_actions_init (EMsgComposer *composer)
 		G_OBJECT (ACTION (ATTACH)),
 		"short-label", _("Attach"), NULL);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	visible = TRUE;
 #else
 	visible = FALSE;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 3a077c0aa6..0b3760159b 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -41,8 +41,6 @@
 #include <config.h>
 #endif
 
-#define SMIME_SUPPORTED 1
-
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
@@ -87,7 +85,7 @@
 #include <camel/camel-multipart-encrypted.h>
 #include <camel/camel-string-utils.h>
 #include <camel/camel-cipher-context.h>
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 #include <camel/camel-smime-context.h>
 #endif
 
@@ -759,7 +757,7 @@ build_message (EMsgComposer *composer,
 	action = GTK_TOGGLE_ACTION (ACTION (PGP_ENCRYPT));
 	pgp_encrypt = gtk_toggle_action_get_active (action);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	action = GTK_TOGGLE_ACTION (ACTION (SMIME_SIGN));
 	smime_sign = gtk_toggle_action_get_active (action);
 
@@ -855,7 +853,7 @@ build_message (EMsgComposer *composer,
 		camel_object_unref (part);
 	}
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	if (smime_sign || smime_encrypt) {
 		CamelInternetAddress *from = NULL;
 		CamelCipherContext *cipher;
@@ -943,7 +941,7 @@ build_message (EMsgComposer *composer,
 		camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
 	camel_object_unref (current);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 skip_content:
 #endif
 	if (recipients) {
-- 
cgit