diff options
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 3d76a51b49..d336e68c5d 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2001-05-09 Jeffrey Stedfast <fejj@ximian.com> + + * e-msg-composer.c (add_inlined_image): Don't wrap content-id with + brackets here as it is now done internally in camel. + 2001-05-03 Radek Doulik <rodo@ximian.com> * e-msg-composer.c (get_signature_html): put signature in 100% diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index dfd63ebf39..01c28dabb0 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -165,7 +165,7 @@ best_encoding (const guchar *text) total = (int) (ch - text); - if ((float) count <= total * 0.17) + if (count * 1.0 <= total * 0.17) return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE; else return CAMEL_MIME_PART_ENCODING_BASE64; @@ -206,7 +206,7 @@ add_inlined_image (gpointer key, gpointer value, gpointer data) { gchar *file_name = (gchar *) key; gchar *cid = (gchar *) value; - gchar *id, *mime_type; + gchar *mime_type; CamelMultipart *multipart = (CamelMultipart *) data; CamelStream *stream; CamelDataWrapper *wrapper; @@ -232,9 +232,7 @@ add_inlined_image (gpointer key, gpointer value, gpointer data) camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); camel_object_unref (CAMEL_OBJECT (wrapper)); - id = g_strconcat ("<", cid, ">", NULL); - camel_mime_part_set_content_id (part, id); - g_free (id); + camel_mime_part_set_content_id (part, cid); /* FIXME: should this use g_basename (file_name)? */ camel_mime_part_set_filename (part, strchr (file_name, '/') ? strrchr (file_name, '/') + 1 : file_name); camel_mime_part_set_encoding (part, CAMEL_MIME_PART_ENCODING_BASE64); |