X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=thread.c;h=c5cc040853cc234d3bc82e1b1cdf21ad9354788d;hp=e34c543ea88bf62b1d547c15eff7f8780dc22eab;hb=9b87576a7ebf2e52a7ca6a0e2dba12fa24bd34dd;hpb=7e6ea12f3d017b6a04d86862e42ef3fd23780d8e

diff --git a/thread.c b/thread.c
index e34c543..c5cc040 100644
--- a/thread.c
+++ b/thread.c
@@ -195,10 +195,6 @@ static void calculate_visibility (CONTEXT * ctx, int *max_depth)
 /* Since the graphics characters have a value >255, I have to resort to
  * using escape sequences to pass the information to print_enriched_string().
  * These are the macros M_TREE_* defined in mutt.h.
- *
- * ncurses should automatically use the default ASCII characters instead of
- * graphics chars on terminals which don't support them (see the man page
- * for curs_addch).
  */
 void mutt_draw_tree (CONTEXT * ctx)
 {
@@ -502,7 +498,7 @@ void mutt_clear_threads (CONTEXT * ctx)
   ctx->tree = NULL;
 
   if (ctx->thread_hash)
-    hash_destroy (&ctx->thread_hash, free);
+    hash_delete (&ctx->thread_hash, free);
 }
 
 static int compare_threads (const void *a, const void *b)
@@ -689,7 +685,7 @@ void mutt_sort_threads (CONTEXT * ctx, int init)
     init = 1;
 
   if (init)
-    ctx->thread_hash = hash_create (ctx->msgcount * 2);
+    ctx->thread_hash = hash_new (ctx->msgcount * 2, 1);
 
   /* we want a quick way to see if things are actually attached to the top of the
    * thread tree or if they're just dangling, so we attach everything to a top
@@ -754,7 +750,7 @@ void mutt_sort_threads (CONTEXT * ctx, int init)
         cur->thread = thread;
         hash_insert (ctx->thread_hash,
                      cur->env->message_id ? cur->env->message_id : "",
-                     thread, 1);
+                     thread);
 
         if (new) {
           if (new->duplicate_thread)
@@ -830,7 +826,7 @@ void mutt_sort_threads (CONTEXT * ctx, int init)
 
       if ((new = hash_find (ctx->thread_hash, ref->data)) == NULL) {
         new = p_new(THREAD, 1);
-        hash_insert (ctx->thread_hash, ref->data, new, 1);
+        hash_insert (ctx->thread_hash, ref->data, new);
       }
       else {
         if (new->duplicate_thread)
@@ -1190,35 +1186,35 @@ int mutt_messages_in_thread (CONTEXT * ctx, HEADER * hdr, int flag)
 }
 
 
-HASH *mutt_make_id_hash (CONTEXT * ctx)
+hash_t *mutt_make_id_hash (CONTEXT * ctx)
 {
   int i;
   HEADER *hdr;
-  HASH *hash;
+  hash_t *hash;
 
-  hash = hash_create (ctx->msgcount * 2);
+  hash = hash_new (ctx->msgcount * 2, 0);
 
   for (i = 0; i < ctx->msgcount; i++) {
     hdr = ctx->hdrs[i];
     if (hdr->env->message_id)
-      hash_insert (hash, hdr->env->message_id, hdr, 0);
+      hash_insert (hash, hdr->env->message_id, hdr);
   }
 
   return hash;
 }
 
-HASH *mutt_make_subj_hash (CONTEXT * ctx)
+hash_t *mutt_make_subj_hash (CONTEXT * ctx)
 {
   int i;
   HEADER *hdr;
-  HASH *hash;
+  hash_t *hash;
 
-  hash = hash_create (ctx->msgcount * 2);
+  hash = hash_new (ctx->msgcount * 2, 1);
 
   for (i = 0; i < ctx->msgcount; i++) {
     hdr = ctx->hdrs[i];
     if (hdr->env->real_subj)
-      hash_insert (hash, hdr->env->real_subj, hdr, 1);
+      hash_insert(hash, hdr->env->real_subj, hdr);
   }
 
   return hash;