#include <camel/camel-stream-buffer.h>
#include <camel/camel-stream-mem.h>
#include <glib/gprintf.h>
+#include <modest-tny-folder.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
gchar *
-modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html)
+modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
{
TnyStream *stream;
TnyMimePart *body;
GtkTextBuffer *buf;
GtkTextIter start, end;
gchar *to_quote;
+ gboolean result_was_html = TRUE;
body = modest_tny_msg_find_body_part(msg, want_html);
if (!body)
gchar *to_quote_converted = modest_text_utils_convert_to_html (to_quote);
g_free (to_quote);
to_quote = to_quote_converted;
+ result_was_html = FALSE;
}
g_object_unref (buf);
g_object_unref (G_OBJECT(stream));
g_object_unref (G_OBJECT(body));
+ if (is_html != NULL)
+ *is_html = result_was_html;
+
return to_quote;
}
}
+#define MODEST_TNY_MSG_PARENT_UID "parent-uid"
+
static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature,
- gboolean is_reply, guint type, GList *attachments)
+create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
+ const gchar *signature, gboolean is_reply,
+ guint type /*ignored*/, GList *attachments)
{
TnyMsg *new_msg;
- TnyHeader *new_header, *header;
+ TnyHeader *new_header;
gchar *new_subject;
- TnyMimePart *body;
+ TnyMimePart *body = NULL;
ModestFormatter *formatter;
gchar *subject_prefix;
+ gboolean no_text_part;
+
+ if (header)
+ g_object_ref (header);
+ else
+ header = tny_msg_get_header (msg);
/* Get body from original msg. Always look for the text/plain
part of the message to create the reply/forwarded mail */
- header = tny_msg_get_header (msg);
- body = modest_tny_msg_find_body_part (msg, FALSE);
-
- /* TODO: select the formatter from account prefs */
- if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
+ if (msg != NULL)
+ body = modest_tny_msg_find_body_part (msg, FALSE);
+
+ if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT,
+ NULL))
formatter = modest_formatter_new ("text/html", signature);
else
formatter = modest_formatter_new ("text/plain", signature);
- /* Format message body */
- if (is_reply) {
- switch (type) {
- case MODEST_TNY_MSG_REPLY_TYPE_CITE:
- default:
- new_msg = modest_formatter_cite (formatter, body, header);
- break;
- case MODEST_TNY_MSG_REPLY_TYPE_QUOTE:
- new_msg = modest_formatter_quote (formatter, body, header, attachments);
- break;
- }
- } else {
- switch (type) {
- case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
- default:
- new_msg = modest_formatter_inline (formatter, body, header, attachments);
- break;
- case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT:
- new_msg = modest_formatter_attach (formatter, body, header);
- break;
- }
+
+ /* if we don't have a text-part */
+ no_text_part = (!body) || (strcmp (tny_mime_part_get_content_type (body), "text/html")==0);
+
+ /* when we're reply, include the text part if we have it, or nothing otherwise. */
+ if (is_reply)
+ new_msg = modest_formatter_quote (formatter, no_text_part ? NULL: body, header,
+ attachments);
+ else {
+ /* for attachements; inline if there is a text part, and include the
+ * full old mail if there was none */
+ if (no_text_part)
+ new_msg = modest_formatter_attach (formatter, msg, header);
+ else
+ new_msg = modest_formatter_inline (formatter, body, header,
+ attachments);
}
+
g_object_unref (G_OBJECT(formatter));
- g_object_unref (G_OBJECT(body));
+ if (body)
+ g_object_unref (G_OBJECT(body));
/* Fill the header */
new_header = tny_msg_get_header (new_msg);
g_free (subject_prefix);
tny_header_set_subject (new_header, (const gchar *) new_subject);
g_free (new_subject);
-
+
+ /* get the parent uid, and set it as a gobject property on the new msg */
+ if (new_msg) {
+ gchar* parent_uid = modest_tny_folder_get_header_unique_id (header);
+ g_object_set_data_full (G_OBJECT(new_msg), MODEST_TNY_MSG_PARENT_UID,
+ parent_uid, g_free);
+ }
+
/* Clean */
g_object_unref (G_OBJECT (new_header));
g_object_unref (G_OBJECT (header));
+ /* ugly to unref it here instead of in the calling func */
return new_msg;
}
+const gchar*
+modest_tny_msg_get_parent_uid (TnyMsg *msg)
+{
+ g_return_val_if_fail (msg, NULL);
+ return g_object_get_data (G_OBJECT(msg), MODEST_TNY_MSG_PARENT_UID);
+}
+
+
+
static void
add_if_attachment (gpointer data, gpointer user_data)
{
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, from, signature, FALSE, forward_type, attachments_list);
+ new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type,
+ attachments_list);
add_attachments (new_msg, attachments_list);
/* Clean */
}
TnyMsg*
-modest_tny_msg_create_reply_msg (TnyMsg *msg,
+modest_tny_msg_create_reply_msg (TnyMsg *msg,
+ TnyHeader *header,
const gchar *from,
const gchar *signature,
ModestTnyMsgReplyType reply_type,
ModestTnyMsgReplyMode reply_mode)
{
TnyMsg *new_msg = NULL;
- TnyHeader *new_header, *header;
+ TnyHeader *new_header;
const gchar* reply_to;
gchar *new_cc = NULL;
const gchar *cc = NULL, *bcc = NULL;
GList *attachments_list = NULL;
/* 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);
+ 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);
+ }
- new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type, attachments_list);
+ new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
+ 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));
+ if (parts)
+ g_object_unref (G_OBJECT (parts));
/* Fill the header */
- header = tny_msg_get_header (msg);
+ if (header)
+ g_object_ref (header);
+ else
+ header = tny_msg_get_header (msg);
new_header = tny_msg_get_header (new_msg);
reply_to = tny_header_get_replyto (header);
projects / modest / blobdiff