projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
thread.c
diff --git
a/thread.c
b/thread.c
index
d3c33c7
..
0012ec2
100644
(file)
--- a/
thread.c
+++ b/
thread.c
@@
-16,6
+16,10
@@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
* 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"
#include "mutt.h"
#include "sort.h"
@@
-41,6
+45,10
@@
static int need_display_subject (CONTEXT *ctx, HEADER *hdr)
{
THREAD *tmp, *tree = hdr->thread;
{
THREAD *tmp, *tree = hdr->thread;
+ /* if the user disabled subject hiding, display it */
+ if (!option (OPTHIDETHREADSUBJECT))
+ return (1);
+
/* if our subject is different from our parent's, display it */
if (hdr->subject_changed)
return (1);
/* if our subject is different from our parent's, display it */
if (hdr->subject_changed)
return (1);
@@
-1369,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);
/* 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);
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;
}
h->refs_changed = h->changed = 1;
}
@@
-1389,7
+1395,6
@@
void mutt_break_thread (HEADER *hdr)
mutt_free_list (&hdr->env->references);
hdr->irt_changed = hdr->refs_changed = hdr->changed = 1;
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);
if (hdr->new_env)
{
mutt_free_list (&hdr->new_env->in_reply_to);
@@
-1397,7
+1402,6
@@
void mutt_break_thread (HEADER *hdr)
}
else
hdr->new_env = mutt_new_envelope ();
}
else
hdr->new_env = mutt_new_envelope ();
-#endif
clean_references (hdr->thread, hdr->thread->child);
}
clean_references (hdr->thread, hdr->thread->child);
}
@@
-1412,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);
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);
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);
mutt_set_flag (ctx, child, M_TAG, 0);