move rfc822.c as well

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

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index c8cfd19..dfd2645 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -24,13 +24,14 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "mutt_crypt.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "handler.h"
 #include "enter.h"
-#include "mime.h"
 #include "copy.h"
 #include "pager.h"
 #include "recvattach.h"
@@ -1789,7 +1790,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
      but we know that this may only be text thus we assume Latin-1
      here. */
   if (!mutt_get_body_charset (body_charset, sizeof (body_charset), m))
-    strfcpy (body_charset, "iso-8859-1", sizeof body_charset);
+    m_strcpy(body_charset, sizeof(body_charset), "iso-8859-1");
 
   fseeko (s->fpin, m->offset, 0);
   last_pos = m->offset;
@@ -3622,7 +3623,7 @@ static crypt_key_t *crypt_ask_for_key (char *tag,
 
     for (l = id_defaults; l; l = l->next)
       if (!m_strcasecmp(whatfor, l->what)) {
-        strfcpy (resp, NONULL (l->dflt), sizeof (resp));
+        m_strcpy(resp, sizeof(resp), NONULL(l->dflt));
         break;
       }
   }