diff options
Diffstat (limited to 'composer/e-msg-composer.c')
| -rw-r--r-- | composer/e-msg-composer.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index dd3a228fb9..11b64a7ff9 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 @@ -757,7 +755,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); @@ -853,7 +851,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; @@ -941,7 +939,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) { @@ -4595,6 +4593,14 @@ e_msg_composer_set_enable_autosave (EMsgComposer *composer, } gboolean +e_msg_composer_is_exiting (EMsgComposer *composer) +{ + g_return_val_if_fail (composer != NULL, FALSE); + + return composer->priv->application_exiting; +} + +gboolean e_msg_composer_request_close_all (void) { GSList *iter, *next; |