[dovecot-cvs] dovecot/src/lib-storage mail-thread.c,1.2,1.3

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage
In directory danu:/tmp/cvs-serv12447/lib-storage

Modified Files:
	mail-thread.c 
Log Message:
Duplicate handling was incorrect.



Index: mail-thread.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/mail-thread.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mail-thread.c	9 Jan 2003 22:28:57 -0000	1.2
+++ mail-thread.c	10 Jan 2003 01:48:06 -0000	1.3
@@ -45,7 +45,7 @@
 /* Try to buffer this much data before sending it to output stream. */
 #define OUTPUT_BUF_SIZE 2048
 
-#define NODE_IS_DUMMY(node) ((node)->id == 0 || (node)->id == UINT_MAX)
+#define NODE_IS_DUMMY(node) ((node)->id == 0)
 
 struct root_info {
 	char *base_subject;
@@ -174,14 +174,7 @@
 		/* seen before in references */
 		node->id = id;
 	} else {
-		/* duplicate -> invalidate all of them.
-		   the message-id stays and acts like a dummy node. */
-		if (node->id != UINT_MAX) {
-			add_root(ctx, create_id_node(ctx, node->id,
-						     node->sent_date));
-			node->id = UINT_MAX;
-		}
-
+		/* duplicate */
 		node = create_id_node(ctx, id, sent_date);
 		add_root(ctx, node);
 	}
@@ -378,7 +371,7 @@
 	const char *msgid, *refid;
 	struct node *node;
 
-	i_assert(id > 0 && id < UINT_MAX);
+	i_assert(id > 0);
 
 	/* get our message ID */
 	msgid = get_msgid(&message_id);