X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpmicalg.c;h=1c322be064d206c878357b0f49dd69aa23d135c4;hp=e63c9432e7818dbbaf1511ec629945dd2ffe4370;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/pgpmicalg.c b/pgpmicalg.c
index e63c943..1c322be 100644
--- a/pgpmicalg.c
+++ b/pgpmicalg.c
@@ -19,7 +19,6 @@
 #include "handler.h"
 #include "pgp.h"
 #include "pgppacket.h"
-#include "mime.h"
 #include "charset.h"
 
 #include <stdio.h>
@@ -28,6 +27,9 @@
 #include <ctype.h>
 
 #include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
+
 #include "lib/debug.h"
 
 static struct {
@@ -84,7 +86,7 @@ static void pgp_dearmor (FILE * in, FILE * out)
   /* skip the armor header */
 
   while ((r = fgets (line, sizeof (line), in)) != NULL) {
-    SKIPWS (r);
+    r = vskipspaces(r);
     if (!*r)
       break;
   }