* crypto: small cleanups

This commit is contained in:
djcb 2012-07-18 11:36:42 +03:00
parent 39fe3f417c
commit fe6333dfef
4 changed files with 4 additions and 9 deletions

View File

@ -74,8 +74,7 @@ get_gpg_crypto_context (MuMsgPartOptions opts, GError **err)
(GMIME_GPG_CONTEXT(ctx),
opts & MU_MSG_PART_OPTION_USE_AGENT);
g_mime_gpg_context_set_always_trust
(GMIME_GPG_CONTEXT(ctx),
opts & MU_MSG_PART_OPTION_TRUST_ALWAYS);
(GMIME_GPG_CONTEXT(ctx), FALSE);
g_mime_gpg_context_set_auto_key_retrieve
(GMIME_GPG_CONTEXT(ctx),
opts & MU_MSG_PART_OPTION_AUTO_RETRIEVE_KEY);
@ -97,8 +96,7 @@ get_pkcs7_crypto_context (MuMsgPartOptions opts, GError **err)
}
g_mime_pkcs7_context_set_always_trust
(GMIME_PKCS7_CONTEXT(ctx),
opts & MU_MSG_PART_OPTION_TRUST_ALWAYS);
(GMIME_PKCS7_CONTEXT(ctx), FALSE);
return ctx;
}

View File

@ -220,8 +220,7 @@ enum _MuMsgPartOptions {
MU_MSG_PART_OPTION_CHECK_SIGNATURES = 1 << 1,
MU_MSG_PART_OPTION_AUTO_RETRIEVE_KEY = 1 << 2,
MU_MSG_PART_OPTION_USE_AGENT = 1 << 3,
MU_MSG_PART_OPTION_TRUST_ALWAYS = 1 << 4,
MU_MSG_PART_OPTION_USE_PKCS7 = 1 << 5 /* gpg is the default */
MU_MSG_PART_OPTION_USE_PKCS7 = 1 << 4 /* gpg is the default */
};
typedef enum _MuMsgPartOptions MuMsgPartOptions;

View File

@ -61,8 +61,7 @@ and returns some non-zero error code when this is not the case
| code | meaning |
|------+--------------------------------|
| 0 | ok |
| 1 | some runtime error |
| 2 | > 0 non-verified signatures |
| 1 | some non-verified signature(s) |
.fi
.SH BUGS

View File

@ -141,7 +141,6 @@ struct _MuConfig {
gboolean auto_retrieve; /* assume we're online */
gboolean use_agent; /* attempt to use the gpg-agent */
/* options for view */
gboolean terminator; /* add separator \f between
* multiple messages in mu