aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-mime-part.c13
-rw-r--r--camel/providers/imap/camel-imap-store.c2
3 files changed, 17 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d52e0eafe7..374811a26b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-09 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-mime-part.c (camel_mime_part_set_content_id): Wrap the
+ content-id with <>'s.
+
2001-05-04 Jeffrey Stedfast <fejj@ximian.com>
* providers/smtp/camel-smtp-transport.c (connect_to_server): Add
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index c8720b2fea..e62f7cce27 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -371,8 +371,17 @@ camel_mime_part_get_filename (CamelMimePart *mime_part)
void
camel_mime_part_set_content_id (CamelMimePart *mime_part, const char *contentid)
{
- camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID",
- contentid);
+ char *cid, *id;
+
+ if (contentid)
+ id = g_strstrip (g_strdup (contentid));
+ else
+ id = header_msgid_generate ();
+
+ cid = g_strdup_printf ("<%s>", id);
+ g_free (id);
+ camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID", cid);
+ g_free (cid);
}
const gchar *
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 74f420fe41..98a3421928 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1218,7 +1218,7 @@ get_folder_info_offline (CamelStore *store, const char *top,
/* A kludge to avoid having to pass a struct to the callback */
g_ptr_array_add (folders, imap_store);
- if (!e_path_find_folders (imap_store->storage_path, get_one_folder_offline, folders)) {
+ if (FALSE /*!e_path_find_folders (imap_store->storage_path, get_one_folder_offline, folders)*/) {
camel_disco_store_check_online (CAMEL_DISCO_STORE (imap_store), ex);
fi = NULL;
} else {