aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-09-10 21:11:11 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-09-10 21:11:11 +0800
commit085a0fa503b9d3507a014d6a7a7ac3c2479896e2 (patch)
tree17094eb47a6492b6d3753dfdb44d1cafb79cb400
parenta831ddd7cbbee7457d9b19be14126d2175724c81 (diff)
downloadgsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.tar
gsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.tar.gz
gsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.tar.bz2
gsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.tar.lz
gsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.tar.xz
gsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.tar.zst
gsoc2013-evolution-085a0fa503b9d3507a014d6a7a7ac3c2479896e2.zip
** 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
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-composer-actions.c2
-rw-r--r--composer/e-msg-composer.c10
3 files changed, 13 insertions, 7 deletions
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) {