IMAP: only close socket when not already disconnected (Closes: 493719)

[software/mutt-debian.git] / crypt-mod-pgp-gpgme.c

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index 290adf710d56b3f84401b41fb80a137aa3c6ed04..388056fd8c938cc46b5a2b16190080ff8c9ad6ce 100644 (file)
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -65,6 +65,11 @@ static int crypt_mod_pgp_check_traditional (FILE *fp, BODY *b, int tagged_only)
   return pgp_gpgme_check_traditional (fp, b, tagged_only);
 }
 
   return pgp_gpgme_check_traditional (fp, b, tagged_only);
 }
 

+static void crypt_mod_pgp_invoke_import (const char *fname)
+{
+  pgp_gpgme_invoke_import (fname);
+}
+

 static char *crypt_mod_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc)
 {
   return pgp_gpgme_findkeys (to, cc, bcc);
 static char *crypt_mod_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc)
 {
   return pgp_gpgme_findkeys (to, cc, bcc);


@@ -117,7 +122,7 @@ struct crypt_module_specs crypt_mod_pgp_gpgme =
       crypt_mod_pgp_check_traditional,
       NULL,                    /* pgp_traditional_encryptsign  */
       NULL, /* pgp_invoke_getkeys  */
       crypt_mod_pgp_check_traditional,
       NULL,                    /* pgp_traditional_encryptsign  */
       NULL, /* pgp_invoke_getkeys  */

-      NULL, /* pgp_invoke_import  */
+      crypt_mod_pgp_invoke_import,

       NULL, /* pgp_extract_keys_from_attachment_list  */
 
       NULL,                    /* smime_getkeys */
       NULL, /* pgp_extract_keys_from_attachment_list  */
 
       NULL,                    /* smime_getkeys */