aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-formatter.c12
-rw-r--r--camel/providers/mbox/camel-mbox-folder.c2
3 files changed, 12 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 45cf9db78e..d781b197d5 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,10 @@
2000-03-03 bertrand <bertrand@helixcode.com>
+ * camel-formatter.c (handle_image): in the case
+ of images, put the content object output stream
+ in the url. This allows the message browser
+ to show inline images.
+
* camel-stream-b64.c (my_read_encode): fixed state
0 keep value.
diff --git a/camel/camel-formatter.c b/camel/camel-formatter.c
index 469a096689..1754d854fb 100644
--- a/camel/camel-formatter.c
+++ b/camel/camel-formatter.c
@@ -305,7 +305,7 @@ call_handler_function (CamelFormatter* formatter,
*/
if (mimetype_whole_in) {
mimetype_whole = str_tolower (mimetype_whole_in);
-
+
handler_function = g_hash_table_lookup (
mime_function_table, mimetype_whole);
}
@@ -719,12 +719,12 @@ handle_image (CamelFormatter *formatter, CamelDataWrapper *wrapper)
uuid = lookup_unique_id (formatter->priv->current_root, wrapper);
- tag = g_strdup_printf ("<img src=\"%s\">\n", uuid);
+ tag = g_strdup_printf ("<img src=\"camel://%s\">\n", uuid);
camel_stream_write_string (formatter->priv->stream, tag);
-
+ debug ("handle_image: tag=%s\n", tag);
g_free (uuid);
g_free (tag);
-
+
debug ("handle_image: exiting\n");
}
@@ -991,8 +991,8 @@ camel_formatter_class_init (CamelFormatterClass *camel_formatter_class)
ADD_HANDLER ("multipart/related", handle_multipart_related);
ADD_HANDLER ("multipart/mixed", handle_multipart_mixed);
ADD_HANDLER ("message/rfc822", handle_mime_part);
- ADD_HANDLER ("image/", handle_image);
- ADD_HANDLER ("vcard/", handle_vcard);
+ ADD_HANDLER ("image", handle_image);
+ ADD_HANDLER ("vcard", handle_vcard);
/* body parts don't have mime parts per se, so camel
sticks on the following one */
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c
index d188cf778e..5b37bee6e7 100644
--- a/camel/providers/mbox/camel-mbox-folder.c
+++ b/camel/providers/mbox/camel-mbox-folder.c
@@ -860,7 +860,6 @@ static void
_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException *ex)
{
CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);
- //guint new_msg_number;
CamelStream *output_stream;
guint32 tmp_file_size;
guint32 next_uid;
@@ -873,6 +872,7 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException
CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::append_message\n");
tmp_message_filename = g_strdup_printf ("%s.tmp", mbox_folder->folder_file_path);
+
/* write the message itself */
output_stream = camel_stream_fs_new_with_name (tmp_message_filename, CAMEL_STREAM_FS_WRITE);
if (output_stream != NULL) {