From 782a42ee7d5ee47607d742a3201715e4201f2e3a Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 21 Feb 2001 17:20:00 +0000 Subject: Fixes for IMAP4-pre-rev1 from Torsten Schulz. * providers/imap/camel-imap-folder.c (fetch_medium): Fixes for IMAP4-pre-rev1 from Torsten Schulz. svn path=/trunk/; revision=8318 --- camel/ChangeLog | 5 +++++ camel/providers/imap/camel-imap-folder.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index cbbb694398..26ed34e472 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2001-02-21 Dan Winship + + * providers/imap/camel-imap-folder.c (fetch_medium): Fixes for + IMAP4-pre-rev1 from Torsten Schulz. + 2001-02-20 Not Zed * camel-mime-utils.c (mail_list_magic): Take the ^Header: part out diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 8852b1f292..87807bcbe5 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -679,7 +679,8 @@ fetch_medium (CamelFolder *folder, const char *uid, const char *section_text, CAMEL_IMAP_STORE_LOCK (store, command_lock); if (store->server_level < IMAP_LEVEL_IMAP4REV1 && !*section_text) { response = camel_imap_command (store, folder, ex, - "UID FETCH %s RFC822.PEEK"); + "UID FETCH %s RFC822.PEEK", + uid); } else { response = camel_imap_command (store, folder, ex, "UID FETCH %s BODY.PEEK[%s]", @@ -694,7 +695,12 @@ fetch_medium (CamelFolder *folder, const char *uid, const char *section_text, if (!result) return NULL; - p = e_strstrcase (result, "BODY"); + + if (store->server_level < IMAP_LEVEL_IMAP4REV1 && !*section_text) + p = e_strstrcase (result, "RFC822"); + else + p = e_strstrcase (result, "BODY"); + if (p) medium = parse_headers (&p, type); else { -- cgit v1.2.3