0.9.4claws20

* src/procmsg.c
        fix search for oldest node in subject threading

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a1c543258a99bbd2e8c7477c8e804aff62f45088..fde73d55ac95736ecfa56af2f19968b812ab15c2 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-08-14 [christoph] 0.9.4claws20
+
+       * src/procmsg.c
+               fix search for oldest node in subject threading
+
 2003-08-14 [christoph] 0.9.4claws19
 
        * src/procmsg.c

diff --git a/configure.ac b/configure.ac
index 9d2f681640d43846fbd3c6cb3be5043197410a81..46d2d412f0fc13b6e7363fc37e03ced002c10660 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/procmsg.c b/src/procmsg.c
index 2b0034229ea0228a4681385aeabeb04b5c2c3366..7cc0a05a828a26c0f895fedf59019ceae239ec1e 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -190,7 +190,7 @@ static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
        if (tuples->len > 0) {
                int i;
                GNode *relation_node;
-               MsgInfo *relation_msginfo, *best_msginfo;
+               MsgInfo *relation_msginfo = NULL, *best_msginfo = NULL;
                gboolean match;
 
                /* check all nodes with the same subject to find the best parent */
@@ -201,8 +201,9 @@ static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
 
                        /* best node should be the oldest in the found nodes */
                        /* parent node must not be older then msginfo */
-                       if (best_msginfo->date_t < relation_msginfo->date_t &&
-                           relation_msginfo->date_t < msginfo->date_t)
+                       if ((relation_msginfo->date_t < msginfo->date_t) &&
+                           ((best_msginfo == NULL) ||
+                            (best_msginfo->date_t > relation_msginfo->date_t)))
                                match = TRUE;
 
                        /* parent node must not be more then thread_by_subject_max_age