fix incorrect subject by threading

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 404103e21c038c3694698524484c957630d37699..8b726f88702698be17987aeecc55106c420492aa 100644 (file)
--- 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 d31a76abaf001e813dc620b5ef5defb238d8bd5a..2fcb3d09e7000abbedc941578a79d7786bd7bed0 100644 (file)
--- 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 979cf4e0e55bec6fd7e227cfb4f2e0fd632db3f3..5b74a8b3d7ca9c5240980f96e549b67e41b97b5c 100644 (file)
--- 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 afc93634afe619110b21154e48796416671f3397..9177fac537289b619ccffa0420f06b7b998a7be4 100644 (file)
--- 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);
 }