From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Fri, 9 Nov 2001 19:34:54 +0000 (+0000)
Subject: fix incorrect subject by threading
X-Git-Tag: rel_0_6_6~156
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9194b91649670a8c360d050d5aa07296255972d1

fix incorrect subject by threading
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 404103e21..8b726f887 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-11-07 [alfons]	0.6.5.claws3
+	
+	* src/utils.c
+	* src/procmsg.c
+		do what I mean and correct threading by subject so it really
+		ignores attracting lines without "Re: "
+
 2001-11-07 [alfons]	0.6.5.claws2
 
 	* src/procmsg.c
diff --git a/configure.in b/configure.in
index d31a76aba..2fcb3d09e 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/procmsg.c b/src/procmsg.c
index 979cf4e0e..5b74a8b3d 100644
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -425,6 +425,8 @@ void procmsg_get_mark_sum(const gchar *folder,
 		g_hash_table_foreach(mark_table, mark_sum_func, &marksum);
 		g_hash_table_destroy(mark_table);
 	}
+	debug_print("mark->new = %d, mark->unread = %d, mark->total = %d\n",
+		    *(marksum.new), *(marksum.unread), *(marksum.total));
 }
 
 static GHashTable *procmsg_read_mark_file(const gchar *folder)
@@ -546,7 +548,7 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
 
 		if (msginfo->inreplyto)
 			parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
-		if (parent == NULL && !subject_is_reply(msginfo->subject))
+		if (parent == NULL && subject_is_reply(msginfo->subject))
 			parent = subject_table_lookup(subject_table, msginfo->subject);
 		
 		if (parent && parent != node) {
diff --git a/src/utils.c b/src/utils.c
index afc93634a..9177fac53 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2320,5 +2320,5 @@ gboolean subject_is_reply(const gchar *subject)
 	 * advanced Re: detection like "Re[4]", "ANTW:" or
 	 * Re: Re: Re: Re: Re: Re: Re: Re:" stuff. */
 	if (subject == NULL) return FALSE;
-	else return 0 == g_strcasecmp(subject, "Re: ");
+	else return 0 == g_strncasecmp(subject, "Re: ", 4);
 }