X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt.c;h=c0c64ad4ab46d6edc3552251d4c3722ef2df23b9;hp=c1225ac3ec792c82ba8401b62689f0a4bea0207f;hb=83532821ae9fab034d0d630b78330c9ea4ff4cf3;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c

diff --git a/crypt.c b/crypt.c
index c1225ac..c0c64ad 100644
--- a/crypt.c
+++ b/crypt.c
@@ -22,10 +22,11 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/macros.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "mutt_curses.h"
-#include "mime.h"
 #include "copy.h"
 #include "mutt_crypt.h"
 #include "pgp.h"
@@ -555,7 +556,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
 {
   int i;
   char tempfname[_POSIX_PATH_MAX], *mbox;
-  ADDRESS *tmp = NULL;
+  address_t *tmp = NULL;
   FILE *fpout;
 
   if (!WithCrypto)
@@ -750,7 +751,7 @@ int mutt_signed_handler (BODY * a, STATE * s)
     if ((protocol_minor = strchr (protocol, '/')))
       protocol_minor++;
 
-    strfcpy (major, protocol, sizeof (major));
+    m_strcpy(major, sizeof(major), protocol);
     if ((t = strchr (major, '/')))
       *t = '\0';