#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>
+#include <tny-camel-mem-stream.h>
#include "modest-formatter.h"
#include "modest-text-utils.h"
#include "modest-tny-platform-factory.h"
#include <modest-runtime.h>
+#define MAX_BODY_LENGTH 4096
+
typedef struct _ModestFormatterPrivate ModestFormatterPrivate;
struct _ModestFormatterPrivate {
gchar *content_type;
static gchar *
extract_text (ModestFormatter *self, TnyMimePart *body)
{
+ TnyStream *mp_stream;
TnyStream *stream;
GtkTextBuffer *buf;
GtkTextIter start, end;
gchar *text, *converted_text;
ModestFormatterPrivate *priv;
+ gint total;
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, NULL);
+ mp_stream = tny_mime_part_get_decoded_stream (body);
+
+ total = 0;
+
+ while (!tny_stream_is_eos (mp_stream)) {
+ gchar buffer [128];
+ gint n_read;
+ gint next_read;
+
+ next_read = MIN (128, MAX_BODY_LENGTH - total);
+ if (next_read == 0)
+ break;
+ n_read = tny_stream_read (mp_stream, buffer, next_read);
+ if (n_read > 0) {
+ gint n_write;
+ n_write = tny_stream_write (stream, buffer, n_read);
+ total += n_write;
+ } else if (n_read == -1) {
+ break;
+ }
+ }
+
tny_stream_reset (stream);
g_object_unref (G_OBJECT(stream));
TnyStream *text_body_stream;
/* Create the stream */
- text_body_stream = TNY_STREAM (tny_camel_stream_new
- (camel_stream_mem_new_with_buffer
- (text, strlen(text))));
+ text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+ (text, strlen(text)));
/* Construct MIME part */
tny_stream_reset (text_body_stream);
TnyMsg *new_msg = NULL;
TnyMimePart *body_part = NULL;
ModestFormatterPrivate *priv;
+ gchar *txt;
/* Build new part */
new_msg = modest_formatter_create_message (self, TRUE, TRUE, FALSE);
/* Create the two parts */
priv = MODEST_FORMATTER_GET_PRIVATE (self);
- construct_from_text (body_part, "", priv->content_type);
+ txt = modest_text_utils_cite ("", priv->content_type, priv->signature,
+ NULL, tny_header_get_date_sent (header));
+ construct_from_text (body_part, txt, priv->content_type);
+ g_free (txt);
g_object_unref (body_part);
if (msg) {
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
priv->content_type = NULL;
+ priv->signature = NULL;
}
static void
modest_formatter_wrapper_cite (ModestFormatter *self, const gchar *text, TnyHeader *header,
GList *attachments)
{
+ gchar *result, *from;
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
- return modest_text_utils_cite (text,
- priv->content_type,
- priv->signature,
- tny_header_get_from (header),
- tny_header_get_date_sent (header));
+ from = tny_header_dup_from (header);
+ result = modest_text_utils_cite (text,
+ priv->content_type,
+ priv->signature,
+ from,
+ tny_header_get_date_sent (header));
+ g_free (from);
+ return result;
}
static gchar *
modest_formatter_wrapper_inline (ModestFormatter *self, const gchar *text, TnyHeader *header,
GList *attachments)
{
+ gchar *result, *from, *to, *subject;
ModestFormatterPrivate *priv = MODEST_FORMATTER_GET_PRIVATE (self);
- return modest_text_utils_inline (text,
- priv->content_type,
- priv->signature,
- tny_header_get_from (header),
- tny_header_get_date_sent (header),
- tny_header_get_to (header),
- tny_header_get_subject (header));
+ from = tny_header_dup_from (header);
+ to = tny_header_dup_to (header);
+ subject = tny_header_dup_subject (header);
+ result = modest_text_utils_inline (text,
+ priv->content_type,
+ priv->signature,
+ from,
+ tny_header_get_date_sent (header),
+ to,
+ subject);
+ g_free (subject);
+ g_free (to);
+ g_free (from);
+ return result;
}
static gchar *
GList *filenames = NULL;
GList *node = NULL;
gchar *result = NULL;
-
+ gchar *from;
+
/* First we need a GList of attachments filenames */
for (node = attachments; node != NULL; node = g_list_next (node)) {
TnyMimePart *part = (TnyMimePart *) node->data;
gchar *filename = NULL;
if (TNY_IS_MSG (part)) {
TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
- filename = g_strdup (tny_header_get_subject (header));
+ filename = tny_header_dup_subject (header);
if ((filename == NULL)||(filename[0] == '\0')) {
g_free (filename);
filename = g_strdup (_("mail_va_no_subject"));
g_object_unref (header);
} else {
filename = g_strdup (tny_mime_part_get_filename (part));
- if ((filename == NULL)||(filename[0] == '\0'))
+ if ((filename == NULL)||(filename[0] == '\0')) {
+ g_free (filename);
filename = g_strdup ("");
+ }
}
- filenames = g_list_append (filenames, filename);
+ filenames = g_list_prepend (filenames, filename);
}
- filenames = g_list_reverse (filenames);
/* TODO: get 80 from the configuration */
+ from = tny_header_dup_from (header);
result = modest_text_utils_quote (text,
priv->content_type,
priv->signature,
- tny_header_get_from (header),
+ from,
tny_header_get_date_sent (header),
filenames,
80);
+ g_free (from);
g_list_foreach (filenames, (GFunc) g_free, NULL);
g_list_free (filenames);