THREAD X-REFERENCES2: Don't return (0) nodes.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/index-thread-finish.c b/src/lib-storage/index/index-thread-finish.c
index 217f04a9efa4caa428d7dd304b8528390a18527c..e919c2b28e2988f9894d6040f2704834a45760f0 100644 (file)
--- a/src/lib-storage/index/index-thread-finish.c
+++ b/src/lib-storage/index/index-thread-finish.c
@@ -420,10 +420,20 @@ static void sort_root_nodes_ref2(struct thread_finish_context *ctx,
        const struct mail_thread_node *node;
        struct mail_thread_root_node *roots, *root;
        struct mail_thread_child_node child;
+       const struct mail_thread_shadow_node *shadows;
        unsigned int root_count;
        uint32_t idx, parent_idx;
 
        roots = array_get_modifiable(&ctx->roots, &root_count);
+
+       /* drop childless dummy nodes */
+       shadows = array_idx(&ctx->shadow_nodes, 0);
+       for (idx = 1; idx < root_count; idx++) {
+               if (roots[idx].dummy &&
+                   shadows[roots[idx].node.idx].first_child_idx == 0)
+                       roots[idx].ignore = TRUE;
+       }
+
        for (idx = 1; idx < record_count; idx++) {
                node = array_idx(&ctx->cache->thread_nodes, idx);
                if (!MAIL_THREAD_NODE_EXISTS(node))