projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
thread.c
diff --git
a/thread.c
b/thread.c
index
814e00e
..
d07f328
100644
(file)
--- a/
thread.c
+++ b/
thread.c
@@
-338,7
+338,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) {
((env->real_subj != env->subject) || (!option (OPTSORTRE)))) {
for (curlist = subjects, oldlist = NULL;
curlist; oldlist = curlist, curlist = curlist->next) {
- rc =
safe
_strcmp (env->real_subj, curlist->data);
+ rc =
mutt
_strcmp (env->real_subj, curlist->data);
if (rc >= 0)
break;
}
if (rc >= 0)
break;
}
@@
-398,7
+398,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 &&
(last->message->received < tmp->message->received) :
(last->message->date_sent < tmp->message->date_sent))) &&
tmp->message->env->real_subj &&
-
safe
_strcmp (subjects->data, tmp->message->env->real_subj) == 0)
+
mutt
_strcmp (subjects->data, tmp->message->env->real_subj) == 0)
last = tmp; /* best match so far */
}
last = tmp; /* best match so far */
}
@@
-471,7
+471,7
@@
static void pseudo_threads (CONTEXT * ctx)
* parent, since otherwise they rightly belong to the message
* we're attaching. */
if (tmp == cur
* parent, since otherwise they rightly belong to the message
* we're attaching. */
if (tmp == cur
- || !
safe
_strcmp (tmp->message->env->real_subj,
+ || !
mutt
_strcmp (tmp->message->env->real_subj,
parent->message->env->real_subj)) {
tmp->message->subject_changed = 0;
parent->message->env->real_subj)) {
tmp->message->subject_changed = 0;
@@
-669,7
+669,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)
if (!tmp)
cur->subject_changed = 1;
else if (cur->env->real_subj && tmp->message->env->real_subj)
- cur->subject_changed =
safe
_strcmp (cur->env->real_subj,
+ cur->subject_changed =
mutt
_strcmp (cur->env->real_subj,
tmp->message->env->
real_subj) ? 1 : 0;
else
tmp->message->env->
real_subj) ? 1 : 0;
else
@@
-821,7
+821,7
@@
void mutt_sort_threads (CONTEXT * ctx, int init)
if (!cur->env->references)
ref = ref->next;
else {
if (!cur->env->references)
ref = ref->next;
else {
- if (
safe
_strcmp (ref->data, cur->env->references->data))
+ if (
mutt
_strcmp (ref->data, cur->env->references->data))
ref = cur->env->references;
else
ref = cur->env->references->next;
ref = cur->env->references;
else
ref = cur->env->references->next;
@@
-843,7
+843,7
@@
void mutt_sort_threads (CONTEXT * ctx, int init)
if (new->duplicate_thread)
new = new->parent;
if (is_descendant (new, thread)) /* no loops! */
if (new->duplicate_thread)
new = new->parent;
if (is_descendant (new, thread)) /* no loops! */
-
break
;
+
continue
;
}
if (thread->parent)
}
if (thread->parent)
@@
-1261,14
+1261,7
@@
static void clean_references (THREAD * brk, THREAD * cur)
/* clearing the References: header from obsolete Message-Id(s) */
mutt_free_list (&ref->next);
/* clearing the References: header from obsolete Message-Id(s) */
mutt_free_list (&ref->next);
- 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);
-
- h->refs_changed = h->changed = 1;
+ h->env->refs_changed = h->changed = 1;
}
}
}
}
}
}
@@
-1277,15
+1270,7
@@
void mutt_break_thread (HEADER * hdr)
{
mutt_free_list (&hdr->env->in_reply_to);
mutt_free_list (&hdr->env->references);
{
mutt_free_list (&hdr->env->in_reply_to);
mutt_free_list (&hdr->env->references);
- hdr->irt_changed = hdr->refs_changed = hdr->changed = 1;
-
- if (hdr->new_env) {
- mutt_free_list (&hdr->new_env->in_reply_to);
- mutt_free_list (&hdr->new_env->references);
- }
- else
- hdr->new_env = mutt_new_envelope ();
-
+ hdr->env->irt_changed = hdr->env->refs_changed = 1;
clean_references (hdr->thread, hdr->thread->child);
}
clean_references (hdr->thread, hdr->thread->child);
}
@@
-1299,12
+1284,9
@@
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);
child->env->in_reply_to = mutt_new_list ();
child->env->in_reply_to->data = safe_strdup (parent->env->message_id);
- child->new_env->in_reply_to = mutt_new_list ();
- child->new_env->in_reply_to->data = safe_strdup (parent->env->message_id);
-
mutt_set_flag (ctx, child, M_TAG, 0);
mutt_set_flag (ctx, child, M_TAG, 0);
- child->irt_changed = child->changed = 1;
+ child->
env->
irt_changed = child->changed = 1;
return 1;
}
return 1;
}