static TnyMsg *modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header,
FormatterFunc func, GList *attachments);
-static gchar* modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments);
-static gchar* modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments);
-static gchar* modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments);
+static gchar* modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text,
+ TnyHeader *header, GList *attachments);
+static gchar* modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text,
+ TnyHeader *header, GList *attachments);
+static gchar* modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text,
+ TnyHeader *header, GList *attachments);
static gchar *
extract_text (ModestFormatter *self, TnyMimePart *body)
}
static TnyMsg *
-modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func, GList *attachments)
+modest_formatter_do (ModestFormatter *self, TnyMimePart *body, TnyHeader *header, FormatterFunc func,
+ GList *attachments)
{
TnyMsg *new_msg = NULL;
gchar *body_text = NULL, *txt = NULL;
priv = MODEST_FORMATTER_GET_PRIVATE (self);
construct_from_text (TNY_MIME_PART (body_part), (const gchar*) txt, priv->content_type);
g_object_unref (body_part);
-
+
/* Clean */
g_free (body_text);
g_free (txt);
}
TnyMsg *
-modest_formatter_attach (ModestFormatter *self, TnyMimePart *body, TnyHeader *header)
+modest_formatter_attach (ModestFormatter *self, TnyMsg *msg, TnyHeader *header)
{
TnyMsg *new_msg = NULL;
- gchar *attach_text = NULL;
- const gchar *subject;
- TnyMimePart *body_part = NULL, *attach_part = NULL;
+ TnyMimePart *body_part = NULL;
ModestFormatterPrivate *priv;
TnyPlatformFactory *fact;
/* Build new part */
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), attach_part);
- g_object_unref (attach_part);
-
- /* Clean */
- g_free (attach_text);
+ tny_mime_part_add_part (TNY_MIME_PART (new_msg), TNY_MIME_PART (msg));
return new_msg;
}
/****************/
static gchar *
-modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments)
+modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header,
+ GList *attachments)
{
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
-
+
return modest_text_utils_cite (text,
priv->content_type,
priv->signature,
}
static gchar *
-modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments)
+modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header,
+ GList *attachments)
{
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
}
static gchar *
-modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header, GList *attachments)
+modest_formatter_wrapper_quote (ModestFormatter *self, const gchar *text, TnyHeader *header,
+ GList *attachments)
{
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
GList *filenames = NULL;
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);