From be23d106da1c548762218892fe058aee1fb9e36c Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 2 Apr 2002 23:04:11 +0000 Subject: Handle a ton more nspr i/o errno's. (stream_connect): Act as if we are 2002-04-02 Jeffrey Stedfast * camel-tcp-stream-ssl.c (set_errno): Handle a ton more nspr i/o errno's. (stream_connect): Act as if we are doing a non-blocking connect. This is to try and work around bug #15120 where users get an EINPROGRESS error. Maybe importing a PRFileDesc into SSL mode automagically makes it non-blocking? I dunno. 2002-04-01 Jeffrey Stedfast * camel-folder-summary.c (message_info_new): Updated the construction of the references to match JWZ's updated algorithm initialization (ie, append any In-Reply-To reference onto any References header and never take more than a single message-id from the In-Reply-To header since anything after the first will probably just be email addresses). Fixes bug #1336. svn path=/trunk/; revision=16327 --- camel/camel-folder-summary.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) (limited to 'camel/camel-folder-summary.c') diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index c681ff6123..6aa37010a6 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -1522,7 +1522,7 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h) CamelMessageInfo *mi; const char *received; guchar digest[16]; - struct _header_references *refs, *scan; + struct _header_references *refs, *irt, *scan; char *msgid; int count; char *subject, *from, *to, *cc, *mlist; @@ -1585,10 +1585,39 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h) memcpy(mi->message_id.id.hash, digest, sizeof(mi->message_id.id.hash)); g_free(msgid); } - /* if we have a references, use that, otherwise, see if we have an in-reply-to - header, with parsable content, otherwise *shrug* */ - if ((refs = header_references_decode(header_raw_find(&h, "references", NULL))) != NULL - || (refs = header_references_decode(header_raw_find(&h, "in-reply-to", NULL))) != NULL) { + + /* decode our references and in-reply-to headers */ + refs = header_references_decode (header_raw_find (&h, "references", NULL)); + irt = header_references_decode (header_raw_find (&h, "in-reply-to", NULL)); + if (refs || irt) { + if (irt) { + struct _header_references *n, *r = irt; + + /* If there are multiple things in In-Reply-To that look like Message-IDs, + only use the first one of them: odds are that the later ones are actually + email addresses, not IDs. */ + + /* since header_references_decode() returns the list in reverse order, + free all but the last In-Reply-To message-id */ + while (r->next) { + n = r->next; + g_free (r->id); + g_free (r); + r = n; + } + + irt = r; + + /* The References field is populated from the ``References'' and/or ``In-Reply-To'' + headers. If both headers exist, take the first thing in the In-Reply-To header + that looks like a Message-ID, and append it to the References header. */ + + if (refs) + irt->next = refs; + + refs = irt; + } + count = header_references_list_size(&refs); mi->references = g_malloc(sizeof(*mi->references) + ((count-1) * sizeof(mi->references->references[0]))); count = 0; -- cgit