X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fplugins%2Fpgpmime%2Fpgpmime.c;h=2a0bb7a1862540642f0573026dc4e68289dc172c;hp=30cf0431484629360b7410c7f459a913f3aa67d0;hb=e84ba2db17ea9afcb3b14e5a3d5a350e63b5cf2f;hpb=7aa5fcbf3d01efdc5fb9afe795b295d138f84f5c diff --git a/src/plugins/pgpmime/pgpmime.c b/src/plugins/pgpmime/pgpmime.c index 30cf04314..2a0bb7a18 100644 --- a/src/plugins/pgpmime/pgpmime.c +++ b/src/plugins/pgpmime/pgpmime.c @@ -241,10 +241,6 @@ static SignatureStatus pgpmime_get_sig_status(MimeInfo *mimeinfo) cm_return_val_if_fail(data != NULL, SIGNATURE_INVALID); - if (data->sigstatus == NULL && - prefs_gpg_get_config()->auto_check_signatures) - pgpmime_check_signature(mimeinfo); - return sgpgme_sigstat_gpgme_to_privacy(data->ctx, data->sigstatus); } @@ -254,23 +250,15 @@ static gchar *pgpmime_get_sig_info_short(MimeInfo *mimeinfo) cm_return_val_if_fail(data != NULL, g_strdup("Error")); - if (data->sigstatus == NULL && - prefs_gpg_get_config()->auto_check_signatures) - pgpmime_check_signature(mimeinfo); - return sgpgme_sigstat_info_short(data->ctx, data->sigstatus); } static gchar *pgpmime_get_sig_info_full(MimeInfo *mimeinfo) { PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy; - + cm_return_val_if_fail(data != NULL, g_strdup("Error")); - if (data->sigstatus == NULL && - prefs_gpg_get_config()->auto_check_signatures) - pgpmime_check_signature(mimeinfo); - return sgpgme_sigstat_info_full(data->ctx, data->sigstatus); } @@ -781,6 +769,7 @@ static PrivacySystem pgpmime_system = { pgpmime_encrypt, pgpmime_get_encrypt_warning, pgpmime_inhibit_encrypt_warning, + prefs_gpg_auto_check_signatures, }; void pgpmime_init()