X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=9afdc255ec6548314d75dc3cbd0d08dcbe336d93;hp=f564054e5c028ad13fdd680c65b674ca5ce2a9ff;hb=16392434eb28ef16069eae972640e1f534477f83;hpb=3d937534e7b1ee723f86594b5e4c64c95158a933

diff --git a/copy.c b/copy.c
index f564054..9afdc25 100644
--- a/copy.c
+++ b/copy.c
@@ -16,6 +16,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */ 
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mailbox.h"
 #include "mx.h"
@@ -375,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)
-#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);
@@ -396,9 +395,9 @@ mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
 	  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);
@@ -418,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)
-	  safe_free ((void **)&refs);
+	  FREE(&refs);
 
 	if (fputc ('\n', out) == EOF)
 	  return (-1);
       }
-#undef NEW_ENV
 
       if (h->old || h->read)
       {