X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=7cfe924bc1fc328ef32e3633ca9e755b5a380539;hp=d37f0439fa6211fa1c72d292f8094325834cc1fb;hb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/postpone.c b/postpone.c
index d37f043..7cfe924 100644
--- a/postpone.c
+++ b/postpone.c
@@ -17,14 +17,15 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "enter.h"
 #include "handler.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
-#include "mime.h"
-#include "mapping.h"
 #include "sort.h"
 #include "thread.h"
 #include "mx.h"
@@ -298,8 +299,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       if (ctx) {
         /* if a mailbox is currently open, look to see if the orignal message
            the user attempted to reply to is in this mailbox */
-        p = tmp->data + 18;
-        SKIPWS (p);
+        p = vskipspaces(tmp->data + 18);
         if (!ctx->id_hash)
           ctx->id_hash = mutt_make_id_hash (ctx);
         *cur = hash_find (ctx->id_hash, p);
@@ -318,8 +318,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
         code |= SENDREPLY;
     }
     else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
-      p = tmp->data + 11;
-      SKIPWS (p);
+      p = vskipspaces(tmp->data + 11);
       m_strcpy(fcc, fcclen, p);
       mutt_pretty_mailbox (fcc);
 
@@ -409,8 +408,7 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
   if (!WithCrypto)
     return 0;
 
-  SKIPWS (p);
-  for (; *p; p++) {
+  for (p = vskipspaces(p); *p; p++) {
 
     switch (*p) {
     case 'e':
@@ -491,10 +489,10 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
 
   /* the cryptalg field must not be empty */
   if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg)
-    str_replace (&SmimeCryptAlg, smime_cryptalg);
+    m_strreplace(&SmimeCryptAlg, smime_cryptalg);
 
   if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
-    str_replace (&PgpSignAs, pgp_sign_as);
+    m_strreplace(&PgpSignAs, pgp_sign_as);
 
   return pgp;
 }
@@ -648,7 +646,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       newhdr->security |= mutt_is_application_pgp (newhdr->content);
 
       b->type = TYPETEXT;
-      str_replace (&b->subtype, "plain");
+      m_strreplace(&b->subtype, "plain");
       mutt_delete_parameter ("x-action", &b->parameter);
     }
     else
@@ -657,7 +655,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     if (safe_fclose (&s.fpout) != 0)
       goto bail;
 
-    str_replace (&b->filename, file);
+    m_strreplace(&b->filename, file);
     b->unlink = 1;
 
     mutt_stamp_attachment (b);