evolution r36294 - trunk/composer

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Sep 10 13:11:11 2008
New Revision: 36294
URL: http://svn.gnome.org/viewvc/evolution?rev=36294&view=rev

Log:
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.



Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-composer-actions.c
   trunk/composer/e-msg-composer.c

Modified: trunk/composer/e-composer-actions.c
==============================================================================
--- trunk/composer/e-composer-actions.c	(original)
+++ trunk/composer/e-composer-actions.c	Wed Sep 10 13:11:11 2008
@@ -698,7 +698,7 @@
 		G_OBJECT (ACTION (ATTACH)),
 		"short-label", _("Attach"), NULL);
 
-#if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
+#if defined (HAVE_NSS)
 	visible = TRUE;
 #else
 	visible = FALSE;

Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c	(original)
+++ trunk/composer/e-msg-composer.c	Wed Sep 10 13:11:11 2008
@@ -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 @@
 	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 @@
 		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 @@
 		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) {