X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=thread.c;h=29e876da354ef6ad9f4e52fc991940976187ecf0;hb=0d83646490348c9730d62ee47ad9c8c0e6461a62;hp=675f0119fa4dd606213376f3ecc89556f8d0f6da;hpb=f404a0ca916be07049af51a3022baaaaab94def6;p=apps%2Fmadmutt.git

diff --git a/thread.c b/thread.c
index 675f011..29e876d 100644
--- a/thread.c
+++ b/thread.c
@@ -561,7 +561,7 @@ void mutt_clear_threads (CONTEXT *ctx)
   ctx->tree = NULL;
 
   if (ctx->thread_hash)
-    hash_destroy (&ctx->thread_hash, *free);
+    hash_destroy (&ctx->thread_hash, free);
 }
 
 int compare_threads (const void *a, const void *b)
@@ -643,7 +643,7 @@ THREAD *mutt_sort_subthreads (THREAD *thread, int init)
 	  array[i] = thread;
 	}
 
-	qsort ((void *) array, i, sizeof (THREAD *), *compare_threads);
+	qsort ((void *) array, i, sizeof (THREAD *), compare_threads);
 
 	/* attach them back together.  make thread the last sibling. */
 	thread = array[0];
@@ -1377,14 +1377,12 @@ static void clean_references (THREAD *brk, THREAD *cur)
       /* clearing the References: header from obsolete Message-Id(s) */
       mutt_free_list (&ref->next);
 
-#ifdef IMAP_EDIT_THREADS
       if (h->new_env)
 	mutt_free_list (&h->new_env->references);
       else
 	h->new_env = mutt_new_envelope ();
 
       h->new_env->references = mutt_copy_list (h->env->references);
-#endif
 
       h->refs_changed = h->changed = 1;
     }
@@ -1397,7 +1395,6 @@ void mutt_break_thread (HEADER *hdr)
   mutt_free_list (&hdr->env->references);
   hdr->irt_changed = hdr->refs_changed = hdr->changed = 1;
 
-#ifdef IMAP_EDIT_THREADS
   if (hdr->new_env)
   {
     mutt_free_list (&hdr->new_env->in_reply_to);
@@ -1405,7 +1402,6 @@ void mutt_break_thread (HEADER *hdr)
   }
   else
     hdr->new_env = mutt_new_envelope ();
-#endif
 
   clean_references (hdr->thread, hdr->thread->child);
 }
@@ -1420,10 +1416,8 @@ static int link_threads (HEADER *parent, HEADER *child, CONTEXT *ctx)
   child->env->in_reply_to = mutt_new_list ();
   child->env->in_reply_to->data = safe_strdup (parent->env->message_id);
 
-#ifdef IMAP_EDIT_THREADS
   child->new_env->in_reply_to = mutt_new_list ();
   child->new_env->in_reply_to->data = safe_strdup (parent->env->message_id);
-#endif
   
   mutt_set_flag (ctx, child, M_TAG, 0);