wibble

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

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index 54b2af0..977a8c1 100644 (file)
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -1,19 +1,10 @@
-/* 
+/*
+ * Copyright notice from original mutt:
  * Copyright (C) 2004 g10 Code GmbH
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /* 
@@ -26,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)
@@ -51,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,
@@ -67,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);
 }