#include <tny-folder.h>
#include <modest-runtime.h>
#include "modest-formatter.h"
-#include <tny-camel-stream.h>
+#include <tny-camel-mem-stream.h>
#include <tny-camel-mime-part.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-mem.h>
#include <glib/gprintf.h>
#include <modest-tny-folder.h>
+#include "modest-tny-mime-part.h"
+
#ifdef HAVE_CONFIG_H
#include <config.h>
TnyStream *text_body_stream;
/* Create the stream */
- text_body_stream = TNY_STREAM (tny_camel_stream_new
- (camel_stream_mem_new_with_buffer
- (body, (body ? strlen(body) : 0))));
+ text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+ (body, (body ? strlen(body) : 0)));
text_body_part = modest_formatter_create_body_part (NULL, msg);
/* Construct MIME part */
tny_stream_reset (text_body_stream);
- tny_mime_part_construct_from_stream (text_body_part,
- text_body_stream,
- content_type);
+ tny_mime_part_construct (text_body_part,
+ text_body_stream,
+ content_type, "7bit");
tny_stream_reset (text_body_stream);
g_object_unref (G_OBJECT(text_body_part));
TnyStream *html_body_stream;
/* Create the stream */
- html_body_stream = TNY_STREAM (tny_camel_stream_new
- (camel_stream_mem_new_with_buffer
- (body, strlen(body))));
+ html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+ (body, strlen(body)));
/* Create body part if needed */
html_body_part = modest_formatter_create_body_part (NULL, msg);
/* Construct MIME part */
tny_stream_reset (html_body_stream);
- tny_mime_part_construct_from_stream (html_body_part,
- html_body_stream,
- "text/html; charset=utf-8");
+ tny_mime_part_construct (html_body_part,
+ html_body_stream,
+ "text/html; charset=utf-8",
+ "7bit"); /* Sometimes it might be needed
+ to make this one a 8bit! */
tny_stream_reset (html_body_stream);
g_object_unref (G_OBJECT(html_body_part));
TnyList *parts;
TnyIterator *iterator;
TnyStream *attachment_stream;
-
+ const gchar *enc;
+
if (TNY_IS_MSG (part)) {
g_object_ref (part);
return part;
attachment_cid = tny_mime_part_get_content_id (part);
/* fill the stream */
- attachment_stream = tny_mime_part_get_stream (part);
+ attachment_stream = tny_mime_part_get_decoded_stream (part);
+ enc = tny_mime_part_get_transfer_encoding (part);
tny_stream_reset (attachment_stream);
- tny_mime_part_construct_from_stream (result,
- attachment_stream,
- attachment_content_type);
+ tny_mime_part_construct (result,
+ attachment_stream,
+ attachment_content_type,
+ enc);
tny_stream_reset (attachment_stream);
/* set other mime part fields */
attachment_part = copy_mime_part (old_attachment);
tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
add_inline?"inline":"attachment");
+ tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
if (old_cid)
tny_mime_part_set_content_id (attachment_part, old_cid);
buf = gtk_text_buffer_new (NULL);
stream = TNY_STREAM (tny_gtk_text_buffer_stream_new (buf));
tny_stream_reset (stream);
- tny_mime_part_decode_to_stream (body, stream);
+ tny_mime_part_decode_to_stream (body, stream, NULL);
tny_stream_reset (stream);
gtk_text_buffer_get_bounds (buf, &start, &end);
TnyMimePart *part = NULL;
TnyList *parts = NULL;
TnyIterator *iter = NULL;
+ gchar *header_content_type;
+ gchar *header_content_type_lower = NULL;
if (!msg)
return NULL;
+ /* If it's an application multipart, then we don't get into as we don't
+ * support them (for example application/sml or wap messages */
+ header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type");
+ if (header_content_type) {
+ header_content_type = g_strstrip (header_content_type);
+ header_content_type_lower = g_ascii_strdown (header_content_type, -1);
+ }
+ if (header_content_type_lower &&
+ g_str_has_prefix (header_content_type_lower, "multipart/") &&
+ !g_str_has_prefix (header_content_type_lower, "multipart/signed") &&
+ strstr (header_content_type_lower, "application/")) {
+ g_free (header_content_type_lower);
+ g_free (header_content_type);
+ return NULL;
+ }
+ g_free (header_content_type_lower);
+ g_free (header_content_type);
+
parts = TNY_LIST (tny_simple_list_new());
tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
/* no parts? assume it's single-part message */
if (tny_iterator_is_done(iter)) {
+ const gchar *content_type;
g_object_unref (G_OBJECT(iter));
- return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+ content_type = tny_mime_part_get_content_type (msg);
+ /* if this part cannot be a supported body return NULL */
+ if (!g_str_has_prefix (content_type, "text/")) {
+ return NULL;
+ } else {
+ return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+ }
} else {
do {
- gchar *content_type = NULL;
-
+ gchar *tmp, *content_type = NULL;
+ gboolean has_content_disp_name = FALSE;
+
part = TNY_MIME_PART(tny_iterator_get_current (iter));
if (!part) {
g_object_unref (part);
tny_iterator_next (iter);
continue;
- }
-
+ }
/* we need to strdown the content type, because
* tny_mime_part_has_content_type does not do it...
*/
content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
-
- if (g_str_has_prefix (content_type, desired_mime_type) && !tny_mime_part_is_attachment (part)) {
+
+ /* mime-parts with a content-disposition header (either 'inline' or 'attachment')
+ * and a 'name=' thingy cannot be body parts
+ */
+
+ tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition");
+ if (tmp) {
+ gchar *content_disp = g_ascii_strdown(tmp, -1);
+ g_free (tmp);
+ has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL;
+ g_free (content_disp);
+ }
+
+ if (g_str_has_prefix (content_type, desired_mime_type) && !has_content_disp_name) {
/* we found the desired mime-type! */
g_free (content_type);
break;
else {
/* for attachements; inline if there is a text part, and include the
* full old mail if there was none */
- if (no_text_part)
+ if (no_text_part) {
new_msg = modest_formatter_attach (formatter, msg, header);
- else
+ } else {
new_msg = modest_formatter_inline (formatter, body, header,
attachments);
+ }
}
g_object_unref (G_OBJECT(formatter));
g_object_unref (G_OBJECT (header));
/* ugly to unref it here instead of in the calling func */
+ if (!is_reply & !no_text_part) {
+ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
+ }
+
return new_msg;
}
new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type,
attachments_list);
- add_attachments (TNY_MIME_PART (new_msg), attachments_list, FALSE);
/* Clean */
- if (attachments_list)
+ if (attachments_list) {
+ g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
g_list_free (attachments_list);
+ }
g_object_unref (G_OBJECT (parts));
return new_msg;
}
-gchar*
-modest_tny_msg_get_header (TnyMsg *msg, const gchar *header)
-{
- TnyList *pairs;
- TnyIterator *iter;
- gchar *val;
-
- g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
- g_return_val_if_fail (header, NULL);
-
- pairs = tny_simple_list_new ();
-
- tny_mime_part_get_header_pairs (TNY_MIME_PART(msg), pairs);
- iter = tny_list_create_iterator (pairs);
- val = NULL;
- while (!tny_iterator_is_done(iter) && !val) {
+static gint
+count_addresses (const gchar* addresses)
+{
+ gint count = 1;
- TnyPair *pair = (TnyPair*)tny_iterator_get_current(iter);
- if (strcasecmp (header, tny_pair_get_name(pair)) == 0)
- val = g_strdup (tny_pair_get_value(pair));
-
- tny_iterator_next (iter);
+ if (!addresses)
+ return 0;
+
+ while (*addresses) {
+ if (*addresses == ',' || *addresses == ';')
+ ++count;
+ ++addresses;
}
-
- g_object_unref (pairs);
- g_object_unref (iter);
-
- return val;
+
+ return count;
}
-
/* get the new To:, based on the old header,
* result is newly allocated or NULL in case of error
* */
* for mailing lists, both the Reply-To: and From: should be included
* in the new To:; for now, we're ignoring List-Post
*/
- gchar* list_help = modest_tny_msg_get_header (msg, "List-Help");
+ gchar* list_help = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg),
+ "List-Help");
gboolean is_mailing_list = (list_help != NULL);
g_free (list_help);
/* reply to sender, use ReplyTo or From */
//old_reply_to = tny_header_get_replyto (header);
- old_reply_to = modest_tny_msg_get_header (msg, "Reply-To");
+ old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg),
+ "Reply-To");
old_from = tny_header_get_from (header);
if (!old_from && !old_reply_to) {
g_free (new_to);
new_to = tmp;
}
- }
-
- /* now, strip me (the new From:) from the new_to */
- gchar *tmp = modest_text_utils_remove_address (new_to, from);
- g_free (new_to);
- new_to = tmp;
- /* remove duplicate entries */
- tmp = modest_text_utils_remove_duplicate_addresses (new_to);
- g_free (new_to);
- new_to = tmp;
+ /* remove duplicate entries */
+ gchar *tmp = modest_text_utils_remove_duplicate_addresses (new_to);
+ g_free (new_to);
+ new_to = tmp;
+
+ /* now, strip me (the new From:) from the new_to, but only if
+ * there are >1 addresses there */
+ if (count_addresses (new_to) > 1) {
+ gchar *tmp = modest_text_utils_remove_address (new_to, from);
+ g_free (new_to);
+ new_to = tmp;
+ }
+ }
return new_to;
}
{
TnyMsg *new_msg = NULL;
TnyHeader *new_header;
- gchar *new_to, *new_cc = NULL;
+ gchar *new_to = NULL;
TnyList *parts = NULL;
GList *attachments_list = NULL;
g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
- /* Add attachments */
- if (msg != NULL) {
- parts = TNY_LIST (tny_simple_list_new());
- tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
- tny_list_foreach (parts, add_if_attachment, &attachments_list);
- }
+ parts = TNY_LIST (tny_simple_list_new());
+ tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+ tny_list_foreach (parts, add_if_attachment, &attachments_list);
new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
attachments_list);
- if (attachments_list) {
+ if (attachments_list != NULL) {
g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
g_list_free (attachments_list);
}
tny_header_set_to (new_header, new_to);
g_free (new_to);
}
- new_cc = get_new_cc (header, from);
- if (new_cc) {
- tny_header_set_cc (new_header, new_cc);
- g_free (new_cc);
+
+ if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
+ gchar *new_cc = get_new_cc (header, from);
+ if (new_cc) {
+ tny_header_set_cc (new_header, new_cc);
+ g_free (new_cc);
+ }
}
/* Clean */
}
return g_string_free(type, FALSE);
}
+
+guint64
+modest_tny_msg_estimate_size (const gchar *plain_body, const gchar *html_body,
+ guint64 parts_count,
+ guint64 parts_size)
+{
+ guint64 result;
+
+ /* estimation of headers size */
+ result = 1024;
+
+ /* We add a 20% of size due to the increase in 7bit encoding */
+ if (plain_body) {
+ result += strlen (plain_body) * 120 / 100;
+ }
+ if (html_body) {
+ result += strlen (html_body) * 120 / 100;
+ }
+
+ /* 256 bytes per additional part because of their headers */
+ result += parts_count * 256;
+
+ /* 150% of increase per encoding */
+ result += parts_size * 3 / 2;
+
+ return result;
+}
projects / modest / blobdiff