diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-08-01 02:19:20 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-08-01 02:19:20 +0800 |
| commit | a38c09b58fdd10f4b38abf874fbfd73fd10bbadc (patch) | |
| tree | 639827707a6d226019eab7c46b43af9a75e8c705 | |
| parent | 3c57850311b0d9112e003b687058c678845259d0 (diff) | |
| download | gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.tar gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.tar.gz gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.tar.bz2 gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.tar.lz gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.tar.xz gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.tar.zst gsoc2013-evolution-a38c09b58fdd10f4b38abf874fbfd73fd10bbadc.zip | |
Bug 733776 - Should not digitally sign the draft messages
| -rw-r--r-- | composer/e-msg-composer.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 75aa108678..96341ed2f0 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1116,17 +1116,19 @@ composer_build_message (EMsgComposer *composer, context->session = e_msg_composer_ref_session (composer); context->from = e_msg_composer_get_from (composer); - if (flags & COMPOSER_FLAG_PGP_SIGN) - context->pgp_sign = TRUE; + if (!(flags & COMPOSER_FLAG_SAVE_DRAFT)) { + if (flags & COMPOSER_FLAG_PGP_SIGN) + context->pgp_sign = TRUE; - if (flags & COMPOSER_FLAG_PGP_ENCRYPT) - context->pgp_encrypt = TRUE; + if (flags & COMPOSER_FLAG_PGP_ENCRYPT) + context->pgp_encrypt = TRUE; - if (flags & COMPOSER_FLAG_SMIME_SIGN) - context->smime_sign = TRUE; + if (flags & COMPOSER_FLAG_SMIME_SIGN) + context->smime_sign = TRUE; - if (flags & COMPOSER_FLAG_SMIME_ENCRYPT) - context->smime_encrypt = TRUE; + if (flags & COMPOSER_FLAG_SMIME_ENCRYPT) + context->smime_encrypt = TRUE; + } context->need_thread = context->pgp_sign || context->pgp_encrypt || |