projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
fd338e5
..
7cfe924
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-489,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)
/* 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))
if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
-
str_replace
(&PgpSignAs, pgp_sign_as);
+
m_strreplace
(&PgpSignAs, pgp_sign_as);
return pgp;
}
return pgp;
}
@@
-646,7
+646,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
newhdr->security |= mutt_is_application_pgp (newhdr->content);
b->type = TYPETEXT;
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
mutt_delete_parameter ("x-action", &b->parameter);
}
else
@@
-655,7
+655,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (safe_fclose (&s.fpout) != 0)
goto bail;
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);
b->unlink = 1;
mutt_stamp_attachment (b);