diff options
| -rw-r--r-- | camel/ChangeLog | 10 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-folder.c | 4 | ||||
| -rw-r--r-- | camel/providers/imap/camel-imap-provider.c | 10 |
3 files changed, 17 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index ec2d5118a6..1b52464147 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,13 @@ +2004-04-09 Jeffrey Stedfast <fejj@ximian.com> + + * providers/imap/camel-imap-provider.c: Fix capitalisation of the + "mailcheck" section title and move it to the top (so it matches + with the UI). + + * providers/imap/camel-imap-folder.c (imap_get_message): Fetch the + entire message in one fell swoop even if the message size is + larger than 5k *if* the message is a single part. Fixes bug #56686. + 2004-04-08 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-store.c (get_folder_online): Changed diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 88322ae245..e77d712529 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -2021,8 +2021,8 @@ imap_get_message (CamelFolder *folder, const char *uid, CamelException *ex) && !camel_imap_store_connected(store, ex)) goto fail; - /* If the message is small, fetch it in one piece. */ - if (mi->size < IMAP_SMALL_BODY_SIZE) { + /* If the message is small or only 1 part, fetch it in one piece. */ + if (mi->size < IMAP_SMALL_BODY_SIZE || !mi->content->childs) { msg = get_message_simple (imap_folder, uid, NULL, ex); } else { if (content_info_incomplete (mi->content)) { diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c index 62301307ac..f7e3f732b9 100644 --- a/camel/providers/imap/camel-imap-provider.c +++ b/camel/providers/imap/camel-imap-provider.c @@ -39,6 +39,11 @@ static gint check_equal (char *s1, char *s2); static gint imap_url_equal (gconstpointer a, gconstpointer b); CamelProviderConfEntry imap_conf_entries[] = { + { CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL, + N_("Checking for New Mail") }, + { CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL, + N_("Check for new messages in all folders"), "1" }, + { CAMEL_PROVIDER_CONF_SECTION_END }, { CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL, N_("Connection to Server") }, { CAMEL_PROVIDER_CONF_CHECKBOX, "use_command", NULL, @@ -46,11 +51,6 @@ CamelProviderConfEntry imap_conf_entries[] = { { CAMEL_PROVIDER_CONF_ENTRY, "command", "use_command", N_("Command:"), "ssh -C -l %u %h exec /usr/sbin/imapd" }, { CAMEL_PROVIDER_CONF_SECTION_END }, - { CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL, - N_("Checking for new mail") }, - { CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL, - N_("Check for new messages in all folders"), "1" }, - { CAMEL_PROVIDER_CONF_SECTION_END }, { CAMEL_PROVIDER_CONF_SECTION_START, "folders", NULL, N_("Folders") }, { CAMEL_PROVIDER_CONF_CHECKBOX, "use_lsub", NULL, |