projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andreas Krennmair:
[apps/madmutt.git]
/
copy.c
diff --git
a/copy.c
b/copy.c
index
49e19d7
..
9afdc25
100644
(file)
--- a/
copy.c
+++ b/
copy.c
@@
-379,15
+379,10
@@
mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
if (flags & CH_UPDATE)
{
if ((flags & CH_NOSTATUS) == 0)
if (flags & CH_UPDATE)
{
if ((flags & CH_NOSTATUS) == 0)
-#ifdef IMAP_EDIT_THREADS
-#define NEW_ENV new_env
-#else
-#define NEW_ENV env
-#endif
{
{
- if (h->irt_changed && h->
NEW_ENV
->in_reply_to)
+ if (h->irt_changed && h->
new_env
->in_reply_to)
{
{
- LIST *listp = h->
NEW_ENV
->in_reply_to;
+ LIST *listp = h->
new_env
->in_reply_to;
if (fputs ("In-Reply-To: ", out) == EOF)
return (-1);
if (fputs ("In-Reply-To: ", out) == EOF)
return (-1);
@@
-400,9
+395,9
@@
mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
return (-1);
}
return (-1);
}
- if (h->refs_changed && h->
NEW_ENV
->references)
+ if (h->refs_changed && h->
new_env
->references)
{
{
- LIST *listp = h->
NEW_ENV
->references, *refs = NULL, *t;
+ LIST *listp = h->
new_env
->references, *refs = NULL, *t;
if (fputs ("References: ", out) == EOF)
return (-1);
if (fputs ("References: ", out) == EOF)
return (-1);
@@
-422,12
+417,11
@@
mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
/* clearing refs from memory */
for (t = refs; refs; refs = t->next, t = refs)
/* clearing refs from memory */
for (t = refs; refs; refs = t->next, t = refs)
-
safe_free ((void **)
&refs);
+
FREE(
&refs);
if (fputc ('\n', out) == EOF)
return (-1);
}
if (fputc ('\n', out) == EOF)
return (-1);
}
-#undef NEW_ENV
if (h->old || h->read)
{
if (h->old || h->read)
{