#include <glib/gi18n.h>
#include <string.h>
#include <tny-header.h>
+#include <tny-simple-list.h>
#include <tny-gtk-text-buffer-stream.h>
#include <tny-camel-stream.h>
#include <camel/camel-stream-mem.h>
typedef gchar* FormatterFunc (ModestFormatter *self, const gchar *text, TnyHeader *header);
static TnyMsg *modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header,
- FormatterFunc func);
+ FormatterFunc func, gboolean has_attachments);
static gchar* modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header);
static gchar* modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header);
}
static TnyMsg *
-modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func)
+modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func, gboolean has_attachments)
{
TnyMsg *new_msg = NULL;
gchar *body_text = NULL, *txt = NULL;
ModestFormatterPrivate *priv;
+ TnyMimePart *body_part = NULL;
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (header, NULL);
g_return_val_if_fail (func, NULL);
/* Build new part */
- new_msg = tny_platform_factory_new_msg (modest_runtime_get_platform_factory());
+ new_msg = modest_formatter_create_message (self, TRUE, has_attachments);
+ body_part = modest_formatter_create_body_part (self, new_msg);
if (body)
body_text = extract_text (self, body);
txt = (gchar *) func (self, (const gchar*) body_text, header);
priv = MODEST_FORMATTER_GET_PRIVATE (self);
- construct_from_text (TNY_MIME_PART (new_msg), (const gchar*) txt, priv->content_type);
+ construct_from_text (TNY_MIME_PART (body_part), (const gchar*) txt, priv->content_type);
+ g_object_unref (body_part);
/* Clean */
g_free (body_text);
TnyMsg *
modest_formatter_cite (ModestFormatter *self, TnyMimePart *body, TnyHeader *header)
{
- return modest_formatter_do (self, body, header, modest_formatter_wrapper_cite);
+ return modest_formatter_do (self, body, header, modest_formatter_wrapper_cite, FALSE);
}
TnyMsg *
modest_formatter_quote (ModestFormatter *self, TnyMimePart *body, TnyHeader *header)
{
- return modest_formatter_do (self, body, header, modest_formatter_wrapper_quote);
+ return modest_formatter_do (self, body, header, modest_formatter_wrapper_quote, FALSE);
}
TnyMsg *
-modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *header)
+modest_formatter_inline (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, gboolean has_attachments)
{
- return modest_formatter_do (self, body, header, modest_formatter_wrapper_inline);
+ return modest_formatter_do (self, body, header, modest_formatter_wrapper_inline, has_attachments);
}
TnyMsg *
fact = modest_runtime_get_platform_factory ();
/* Build new part */
- new_msg = tny_platform_factory_new_msg (fact);
- body_part = tny_platform_factory_new_mime_part (fact);
+ new_msg = modest_formatter_create_message (self, TRUE, TRUE);
+ body_part = modest_formatter_create_body_part (self, new_msg);
attach_part = tny_platform_factory_new_mime_part (fact);
/* Create the two parts */
priv = MODEST_FORMATTER_GET_PRIVATE (self);
attach_text = extract_text (self, body);
construct_from_text (body_part, "", priv->content_type);
+ g_object_unref (body_part);
construct_from_text (attach_part, (const gchar*) attach_text, priv->content_type);
subject = tny_header_get_subject (header);
tny_mime_part_set_filename (attach_part, subject ? subject : _("No subject"));
/* Add parts */
- tny_mime_part_add_part (TNY_MIME_PART (new_msg), body_part);
tny_mime_part_add_part (TNY_MIME_PART (new_msg), attach_part);
+ g_object_unref (attach_part);
/* Clean */
g_free (attach_text);
tny_header_get_date_sent (header),
80);
}
+
+TnyMsg *
+modest_formatter_create_message (ModestFormatter *self, gboolean single_body, gboolean has_attachments)
+{
+ TnyMsg *result = NULL;
+ TnyPlatformFactory *fact = NULL;
+ TnyMimePart *body_mime_part = NULL;
+ fact = modest_runtime_get_platform_factory ();
+ result = tny_platform_factory_new_msg (fact);
+ if (has_attachments) {
+ tny_mime_part_set_content_type (TNY_MIME_PART (result), "multipart/mixed");
+ if (!single_body) {
+ body_mime_part = tny_platform_factory_new_mime_part (fact);
+ tny_mime_part_set_content_type (body_mime_part, "multipart/alternative");
+ tny_mime_part_add_part (TNY_MIME_PART (result), body_mime_part);
+ g_object_unref (body_mime_part);
+ }
+ } else if (!single_body) {
+ tny_mime_part_set_content_type (TNY_MIME_PART (result), "multipart/alternative");
+ }
+
+ return result;
+}
+
+TnyMimePart *
+modest_formatter_create_body_part (ModestFormatter *self, TnyMsg *msg)
+{
+ TnyMimePart *result = NULL;
+ const gchar *msg_content_type = NULL;
+ TnyPlatformFactory *fact = NULL;
+
+ fact = modest_runtime_get_platform_factory ();
+ msg_content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
+ /* First it checks if the main part is alternative */
+ if ((msg_content_type != NULL) &&
+ (!g_strcasecmp (msg_content_type, "multipart/alternative"))) {
+ result = tny_platform_factory_new_mime_part (fact);
+ tny_mime_part_add_part (TNY_MIME_PART (msg), result);
+ return result;
+ } else if ((msg_content_type != NULL) &&
+ (!g_strcasecmp (msg_content_type, "multipart/mixed"))) {
+ TnyList *parts = NULL;
+ TnyIterator *iter = NULL;
+ TnyMimePart *alternative_part = NULL;
+
+ parts = TNY_LIST (tny_simple_list_new ());
+ tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+ iter = tny_list_create_iterator (parts);
+ while (!tny_iterator_is_done (iter)) {
+ TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
+ if (!g_strcasecmp(tny_mime_part_get_content_type (part), "multipart/alternative")) {
+ alternative_part = part;
+ break;
+ }
+ tny_iterator_next (iter);
+ }
+ result = tny_platform_factory_new_mime_part (fact);
+ if (alternative_part != NULL) {
+ tny_mime_part_add_part (alternative_part, result);
+ } else {
+ tny_mime_part_add_part (TNY_MIME_PART (msg), result);
+ }
+ g_object_unref (G_OBJECT (parts));
+ return result;
+ } else {
+ /* We add a reference as this method is intended to obtain
+ a ref'ed part */
+ g_object_ref (msg);
+ return TNY_MIME_PART (msg);
+ }
+}
*
* Returns: a newly formatted #TnyMsg or NULL in case of error
**/
-TnyMsg * modest_formatter_inline (ModestFormatter *self, TnyMimePart *part, TnyHeader *header);
+TnyMsg * modest_formatter_inline (ModestFormatter *self, TnyMimePart *part, TnyHeader *header, gboolean has_attachments);
/**
* modest_formatter_attach:
**/
TnyMsg * modest_formatter_attach (ModestFormatter *self, TnyMimePart *part, TnyHeader *header);
+/**
+ * modest_formatter_create_message:
+ * @self: a #ModestFormatter
+ * @single_body: a #gboolean
+ * @has_attachments: a #gboolean
+ *
+ * Creates an empty #TnyMsg with the expected parts for Modest
+ * formatters and body embedders.
+ *
+ * If @has_attachments is %TRUE, the mail will be formatted as
+ * "multipart/mixed", and attachments will be stored as parts
+ * of it. The body will be just another multipart. If %FALSE,
+ * the bodies will be stored directly as the message.
+ *
+ * If @single_body is %TRUE, the body will be stored as a
+ * "multipart/alternative", and the parts will be the different
+ * alternatives. If %FALSE, this body will be stored directly.
+ */
+TnyMsg * modest_formatter_create_message (ModestFormatter *self, gboolean single_body, gboolean has_attachments);
+
+/**
+ * modest_formatter_create_body_part:
+ * @self: a #ModestFormatter
+ *
+ * Obtains a new formatted body part for @msg, or
+ * @msg itself if the body is intended to be stored directly
+ * in it.
+ */
+TnyMimePart * modest_formatter_create_body_part (ModestFormatter *self, TnyMsg *msg);
G_END_DECLS
/* Set priority flags in message */
header = tny_msg_get_header (new_msg);
- tny_header_set_flags (header, priority_flags);
+ if (priority_flags != 0)
+ tny_header_set_flags (header, priority_flags);
/* Call mail operation */
modest_mail_operation_send_mail (self, transport_account, new_msg);
#include "modest-text-utils.h"
static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
- const gchar *content_type, gboolean has_attachments);
+ const gchar *content_type);
static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body);
static void add_attachments (TnyMsg *msg, GList *attachments_list);
static char * get_content_type(const gchar *s);
const gchar *bcc, const gchar* subject, const gchar *body,
GSList *attachments)
{
- TnyPlatformFactory *fact;
TnyMsg *new_msg;
TnyHeader *header;
gchar *content_type;
/* Create new msg */
- fact = modest_runtime_get_platform_factory ();
- new_msg = tny_platform_factory_new_msg (fact);
+ new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL));
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
/* Add the body of the new mail */
/* This is needed even if body is NULL or empty. */
- add_body_part (new_msg, body, content_type, (attachments ? TRUE: FALSE));
+ add_body_part (new_msg, body, content_type);
g_free (content_type);
/* Add attachments */
const gchar *html_body, const gchar *plain_body,
GSList *attachments)
{
- TnyPlatformFactory *fact;
TnyMsg *new_msg;
TnyHeader *header;
gchar *content_type;
/* Create new msg */
- fact = modest_runtime_get_platform_factory ();
- new_msg = tny_platform_factory_new_msg (fact);
+ new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL));
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
content_type = get_content_type(plain_body);
/* Add the body of the new mail */
- add_body_part (new_msg, plain_body, content_type, TRUE);
+ add_body_part (new_msg, plain_body, content_type);
add_html_body_part (new_msg, html_body);
g_free (content_type);
static TnyMimePart *
add_body_part (TnyMsg *msg,
const gchar *body,
- const gchar *content_type,
- gboolean has_attachments)
+ const gchar *content_type)
{
TnyMimePart *text_body_part = NULL;
TnyStream *text_body_stream;
(camel_stream_mem_new_with_buffer
(body, (body ? strlen(body) : 0))));
- /* Create body part if needed */
- if (has_attachments)
- text_body_part = tny_platform_factory_new_mime_part
- (modest_runtime_get_platform_factory ());
- else
- text_body_part = TNY_MIME_PART(msg);
+ text_body_part = modest_formatter_create_body_part (NULL, msg);
/* Construct MIME part */
tny_stream_reset (text_body_stream);
content_type);
tny_stream_reset (text_body_stream);
- /* Add part if needed */
- if (has_attachments) {
- tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part);
- g_object_unref (G_OBJECT(text_body_part));
- }
+ g_object_unref (G_OBJECT(text_body_part));
/* Clean */
g_object_unref (text_body_stream);
(body, strlen(body))));
/* Create body part if needed */
- html_body_part = tny_platform_factory_new_mime_part
- (modest_runtime_get_platform_factory ());
+ html_body_part = modest_formatter_create_body_part (NULL, msg);
/* Construct MIME part */
tny_stream_reset (html_body_stream);
"text/html; charset=utf-8");
tny_stream_reset (html_body_stream);
- /* Add part if needed */
- tny_mime_part_add_part (TNY_MIME_PART (msg), html_body_part);
g_object_unref (G_OBJECT(html_body_part));
/* Clean */
old_attachment = pos->data;
attachment_filename = tny_mime_part_get_filename (old_attachment);
attachment_stream = tny_mime_part_get_stream (old_attachment);
- attachment_part = tny_platform_factory_new_mime_part (
- modest_runtime_get_platform_factory());
-
+ if (TNY_IS_MSG (old_attachment)) {
+ attachment_part = TNY_MIME_PART (tny_platform_factory_new_msg (modest_runtime_get_platform_factory ()));
+ } else {
+ attachment_part = tny_platform_factory_new_mime_part (
+ modest_runtime_get_platform_factory());
+ }
attachment_content_type = tny_mime_part_get_content_type (old_attachment);
attachment_cid = tny_mime_part_get_content_id (old_attachment);
-
+
+ tny_stream_reset (attachment_stream);
tny_mime_part_construct_from_stream (attachment_part,
attachment_stream,
attachment_content_type);
tny_mime_part_set_content_id (attachment_part, attachment_cid);
tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
+ g_object_unref (attachment_stream);
/* g_object_unref (attachment_part); */
}
}
static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature, gboolean is_reply, guint type)
+create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature,
+ gboolean is_reply, guint type, gboolean has_attachments)
{
TnyMsg *new_msg;
TnyHeader *new_header, *header;
switch (type) {
case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
default:
- new_msg = modest_formatter_inline (formatter, body, header);
+ new_msg = modest_formatter_inline (formatter, body, header, has_attachments);
break;
case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT:
new_msg = modest_formatter_attach (formatter, body, header);
add_if_attachment (gpointer data, gpointer user_data)
{
TnyMimePart *part;
- GList *attachments_list;
+ GList **attachments_list;
part = TNY_MIME_PART (data);
- attachments_list = (GList *) user_data;
+ attachments_list = ((GList **) user_data);
- if (tny_mime_part_is_attachment (part))
- attachments_list = g_list_prepend (attachments_list, part);
+ if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))
+ *attachments_list = g_list_prepend (*attachments_list, part);
}
TnyMsg*
TnyList *parts = NULL;
GList *attachments_list = NULL;
- new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type);
/* Add attachments */
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);
+ tny_list_foreach (parts, add_if_attachment, &attachments_list);
+
+ new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type, (attachments_list != NULL));
add_attachments (new_msg, attachments_list);
/* Clean */
const gchar *cc = NULL, *bcc = NULL;
GString *tmp = NULL;
- new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type);
+ new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type, FALSE);
/* Fill the header */
header = tny_msg_get_header (msg);
projects / modest / commitdiff