X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=thread.c;h=1bf0b5fd40fa2f020057d1275e1ed94524f6ced7;hp=c3b78de3e3f447bc7018b418a3f57b120abbb2b5;hb=9342efc81d163ea56e079b4adf2ce17c41c853b0;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/thread.c b/thread.c
index c3b78de..1bf0b5f 100644
--- a/thread.c
+++ b/thread.c
@@ -340,7 +340,7 @@ static LIST *make_subject_list (THREAD * cur, time_t * dateptr)
         ((env->real_subj != env->subject) || (!option (OPTSORTRE)))) {
       for (curlist = subjects, oldlist = NULL;
            curlist; oldlist = curlist, curlist = curlist->next) {
-        rc = str_cmp (env->real_subj, curlist->data);
+        rc = m_strcmp(env->real_subj, curlist->data);
         if (rc >= 0)
           break;
       }
@@ -400,7 +400,7 @@ static THREAD *find_subject (CONTEXT * ctx, THREAD * cur)
             (last->message->received < tmp->message->received) :
             (last->message->date_sent < tmp->message->date_sent))) &&
           tmp->message->env->real_subj &&
-          str_cmp (subjects->data, tmp->message->env->real_subj) == 0)
+          m_strcmp(subjects->data, tmp->message->env->real_subj) == 0)
         last = tmp;             /* best match so far */
     }
 
@@ -473,7 +473,7 @@ static void pseudo_threads (CONTEXT * ctx)
          * parent, since otherwise they rightly belong to the message
          * we're attaching. */
         if (tmp == cur
-            || !str_cmp (tmp->message->env->real_subj,
+            || !m_strcmp(tmp->message->env->real_subj,
                              parent->message->env->real_subj)) {
           tmp->message->subject_changed = 0;
 
@@ -671,7 +671,7 @@ static void check_subjects (CONTEXT * ctx, int init)
     if (!tmp)
       cur->subject_changed = 1;
     else if (cur->env->real_subj && tmp->message->env->real_subj)
-      cur->subject_changed = str_cmp (cur->env->real_subj,
+      cur->subject_changed = m_strcmp(cur->env->real_subj,
                                           tmp->message->env->
                                           real_subj) ? 1 : 0;
     else
@@ -823,7 +823,7 @@ void mutt_sort_threads (CONTEXT * ctx, int init)
         if (!cur->env->references)
           ref = ref->next;
         else {
-          if (str_cmp (ref->data, cur->env->references->data))
+          if (m_strcmp(ref->data, cur->env->references->data))
             ref = cur->env->references;
           else
             ref = cur->env->references->next;
@@ -1284,7 +1284,7 @@ static int link_threads (HEADER * parent, HEADER * child, CONTEXT * ctx)
   mutt_break_thread (child);
 
   child->env->in_reply_to = mutt_new_list ();
-  child->env->in_reply_to->data = str_dup (parent->env->message_id);
+  child->env->in_reply_to->data = m_strdup(parent->env->message_id);
 
   mutt_set_flag (ctx, child, M_TAG, 0);