#include "../modest-tny-msg-view.h"
#include "../modest-tny-transport-actions.h"
+#include "../modest-text-utils.h"
#define MODEST_GLADE PREFIX "/share/modest/glade/modest.glade"
#define MODEST_GLADE_MAIN_WIN "main"
modest_ui_show_edit_window (modest_ui, "", "", "", "", "", NULL);
}
-static gchar*
+
+static gchar *
modest_ui_quote_msg(const TnyMsgIface *src, const gchar *from, time_t sent_date)
{
GList *parts;
TnyTextBufferStream *dest;
TnyMsgMimePartIface *body = NULL;
GtkTextBuffer *buf;
- GtkTextIter begin, end, iter1, iter2, iter3;
- gchar *txt;
- gint tmp;
- gint indent;
- gchar sent_str[101];
- GString *reply_head;
-
+ gint limit = 76; /* TODO: make configurable */
+ gchar *quoted;
+
buf = gtk_text_buffer_new(NULL);
dest = tny_text_buffer_stream_new(buf);
parts = (GList*) tny_msg_iface_get_parts (src);
while (parts) {
- /* TODO: maybe we'd like to quote more than one part?
- * cleanup, fix leaks
- */
+ /* TODO: maybe we'd like to quote more than one part? */
TnyMsgMimePartIface *part =
TNY_MSG_MIME_PART_IFACE(parts->data);
if (tny_msg_mime_part_iface_content_type_is (part, "text/plain")) {
tny_msg_mime_part_iface_decode_to_stream (body, stream);
tny_stream_iface_reset (stream);
- /* format sent_date */
- strftime(sent_str, 100, "%c", localtime(&sent_date));
- reply_head = g_string_new("");
- g_string_printf(reply_head, "On %s, %s wrote:\n", sent_str, from);
-
- gtk_text_buffer_get_iter_at_line(buf, &iter1, 0);
- gtk_text_buffer_insert(buf, &iter1, reply_head->str, -1);
- g_string_free(reply_head, TRUE);
- gtk_text_buffer_get_iter_at_line(buf, &iter1, 1);
- txt = g_malloc0(1);
- while (TRUE) {
- /* at each beginning of this while, iter1 must be at the beginning of
- the (next) line to quote */
-
- iter2 = iter1;
- /* check whether line is already quoted */
- iter2 = iter1;
- /* TODO: what happens if buf is empty? */
- gtk_text_iter_forward_char (&iter2);
- g_free(txt);
- txt = gtk_text_buffer_get_text (buf, &iter1, &iter2, FALSE);
+ quoted = modest_text_utils_quote (buf, from, sent_date, limit);
- /* insert quotation mark */
- tmp = gtk_text_iter_get_offset(&iter1);
- gtk_text_buffer_insert(buf, &iter1, "> ", -1);
-
- /* still at the beginning of the line */
- gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
- iter2 = iter1;
-
- if (strcmp(txt, ">") != 0) {
-
- /* line was not already quoted */
-
- /* now check whether the line must be broken: */
- if (gtk_text_iter_get_chars_in_line(&iter2) >= 79) {
-
- gtk_text_iter_set_line_offset(&iter2, 79);
-
- /* move iter1 behind quote mark at the beginnig of the line */
- gtk_text_iter_forward_word_end(&iter1);
-
- /* save iter2 position */
- iter3 = iter2;
-
- /* move iter2 back one word (from breakpoint in line) */
- gtk_text_iter_backward_word_start(&iter2);
-
- /* check for one-word line (up to iter2) */
- if (!gtk_text_iter_compare(&iter1, &iter2) < 0) {
- gtk_text_iter_forward_word_end(&iter2); /* BUG? */
- }
-
- /* insert linebreak */
- tmp = gtk_text_iter_get_offset(&iter2);
- gtk_text_buffer_insert(buf, &iter2, "\n", -1);
- gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
-
- /* move to the beginning of the "new" line */
- gtk_text_iter_forward_line(&iter1);
-
- /* try to kill 1 space */
- iter2 = iter1;
- gtk_text_iter_forward_char(&iter2);
- g_free(txt);
- txt = gtk_text_buffer_get_text(buf, &iter1, &iter2, FALSE);
- if (strcmp(txt, " ") == 0) {
- tmp = gtk_text_iter_get_offset(&iter1);
- gtk_text_buffer_delete(buf, &iter1, &iter2);
- gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
- }
-
- /* check whether there is a next line to merge */
- iter3 = iter1;
- if (!gtk_text_iter_forward_line(&iter3)) {
- continue;
- }
- /* iter3 is now at the beginning of the next line.*/
-
- /* check for empty line */
- if (gtk_text_iter_get_chars_in_line(&iter3) < 2) {
- continue;
- }
-
- /* check for quote */
- iter2 = iter3;
- gtk_text_iter_forward_char (&iter2);
- g_free(txt);
- txt = gtk_text_buffer_get_text(buf, &iter3, &iter2, FALSE);
- if (strcmp(txt, ">") == 0) {
- /* iter1 is still at the beginning of the newly broken
- * so we don't have to cleanup */
- continue;
- }
-
- if (!gtk_text_iter_forward_to_line_end(&iter1)) {
- /* no further lines to merge */
- continue;
- }
-
- /* "mark" newline */
- iter2 = iter1;
- gtk_text_iter_forward_char(&iter2);
-
- /* do the merge */
- tmp = gtk_text_iter_get_offset(&iter1);
- gtk_text_buffer_delete (buf, &iter1, &iter2);
- gtk_text_buffer_get_iter_at_offset (buf, &iter1, tmp);
-
- /* insert space */
- gtk_text_buffer_insert(buf, &iter1, " ", -1);
- gtk_text_buffer_get_iter_at_offset (buf, &iter1, tmp);
-
- /* move to beginning of line and continue */
- gtk_text_iter_set_line_offset(&iter1, 0);
- continue;
-
- } else {
- /* line doesn't have to be broken, we're done. */
- if (!gtk_text_iter_forward_line(&iter1)) {
- break;
- }
- continue;
- }
- } else {
- /* line was already quoted */
- if (!gtk_text_iter_forward_line(&iter1)) {
- break;
- }
- continue;
- }
- }
-
- gtk_text_buffer_get_bounds (buf, &begin, &end);
- g_free(txt);
- txt = gtk_text_buffer_get_text (buf, &begin, &end, FALSE);
-
- return txt;
+ g_object_unref(stream);
+ g_object_unref(buf);
+ return quoted;
}
static void
projects / modest / blobdiff