Rocco Rutte:

[apps/madmutt.git] / thread.c

diff --git a/thread.c b/thread.c
index 998cd6c..29e876d 100644 (file)
--- a/thread.c
+++ b/thread.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 "sort.h"
 
@@ -557,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)
@@ -639,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];
@@ -1373,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;
     }
@@ -1393,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);
@@ -1401,7 +1402,6 @@ void mutt_break_thread (HEADER *hdr)
   }
   else
     hdr->new_env = mutt_new_envelope ();
-#endif
 
   clean_references (hdr->thread, hdr->thread->child);
 }
@@ -1416,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);