aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/providers/imap/camel-imap-folder.c14
2 files changed, 13 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index dc7a4282da..22355a69b7 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,9 @@
2002-07-31 Jeffrey Stedfast <fejj@ximian.com>
+ * providers/imap/camel-imap-folder.c (parse_fetch_response):
+ Disable my fix to not cache headers as it means that each time we
+ load the message, we've got to re-fecth the headers.
+
* camel-mime-filter-tohtml.c (is_addr_char): Don't use
"isprint(c)" to mean "c >= 32 && c < 128" since it doesn't in most
locales.
@@ -23,7 +27,7 @@
* camel-tcp-stream-openssl.c (socket_connect): Same as above.
(stream_get_local_address): Fix to work with IPv6 addresses.
(stream_get_remote_address): Same.
-
+
* camel-tcp-stream-ssl.c (stream_connect): If building with IPv6
support and the address is an IPv6 address, initialise the
PRNetAddr accordingly.
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 917f8e1bb0..9a060a4736 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -124,7 +124,7 @@ static void imap_thaw (CamelFolder *folder);
static CamelObjectClass *parent_class;
-GData *parse_fetch_response (CamelImapFolder *imap_folder, char *msg_att);
+static GData *parse_fetch_response (CamelImapFolder *imap_folder, char *msg_att);
static void
camel_imap_folder_class_init (CamelImapFolderClass *camel_imap_folder_class)
@@ -2425,7 +2425,7 @@ camel_imap_folder_fetch_data (CamelImapFolder *imap_folder, const char *uid,
return stream;
}
-GData *
+static GData *
parse_fetch_response (CamelImapFolder *imap_folder, char *response)
{
GData *data = NULL;
@@ -2527,17 +2527,19 @@ parse_fetch_response (CamelImapFolder *imap_folder, char *response)
if (uid && body) {
CamelStream *stream;
- if (!header) {
+ if (FALSE /*header*/) {
+ g_free (part_spec);
+ stream = camel_stream_mem_new_with_buffer (body, body_len);
+ } else {
CAMEL_IMAP_FOLDER_LOCK (imap_folder, cache_lock);
stream = camel_imap_message_cache_insert (imap_folder->cache,
uid, part_spec,
body, body_len, NULL);
CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);
- } else {
- stream = camel_stream_mem_new_with_buffer (body, body_len);
}
+
g_datalist_set_data_full (&data, "BODY_PART_STREAM", stream,
- (GDestroyNotify)camel_object_unref);
+ (GDestroyNotify) camel_object_unref);
}
return data;