more simplifcations

[apps/madmutt.git] / crypt-mod-pgp-gpgme.c

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index e23c5fc..977a8c1 100644 (file)
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -17,7 +17,7 @@
 
 #ifdef CRYPT_BACKEND_GPGME
 
-#include "crypt-mod.h"
+#include <lib-crypt/crypt-mod.h>
 #include "crypt-gpgme.h"
 
 static void crypt_mod_pgp_init (void)
@@ -42,14 +42,14 @@ static int crypt_mod_pgp_decrypt_mime (FILE * a, FILE ** b, BODY * c,
   return pgp_gpgme_decrypt_mime (a, b, c, d);
 }
 
-static void crypt_mod_pgp_application_handler (BODY * m, STATE * s)
+static int crypt_mod_pgp_application_handler (BODY * m, STATE * s)
 {
-  pgp_gpgme_application_handler (m, s);
+  return pgp_gpgme_application_handler (m, s);
 }
 
-static void crypt_mod_pgp_encrypted_handler (BODY * m, STATE * s)
+static int crypt_mod_pgp_encrypted_handler (BODY * m, STATE * s)
 {
-  pgp_gpgme_encrypted_handler (m, s);
+  return pgp_gpgme_encrypted_handler (m, s);
 }
 
 static int crypt_mod_pgp_check_traditional (FILE * fp, BODY * b,
@@ -58,8 +58,8 @@ static int crypt_mod_pgp_check_traditional (FILE * fp, BODY * b,
   return pgp_gpgme_check_traditional (fp, b, tagged_only);
 }
 
-static char *crypt_mod_pgp_findkeys (ADDRESS * to, ADDRESS * cc,
-                                     ADDRESS * bcc)
+static char *crypt_mod_pgp_findkeys (address_t * to, address_t * cc,
+                                     address_t * bcc)
 {
   return pgp_gpgme_findkeys (to, cc, bcc);
 }