#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"
void on_account_settings1_activate (GtkMenuItem *,
- gpointer);
+ gpointer);
+
static void on_password_requested (ModestTnyAccountStore *account_store,
const gchar *account_name, gpointer user_data);
g_signal_connect (account_store_iface, "password_requested",
G_CALLBACK(on_password_requested),
NULL);
+
glade_init ();
- priv->glade_xml = glade_xml_new (MODEST_GLADE,
- NULL,NULL);
+ priv->glade_xml = glade_xml_new (MODEST_GLADE, NULL,NULL);
if (!priv->glade_xml) {
g_warning ("failed to do glade stuff");
g_object_unref (obj);
gtk_entry_set_text(GTK_ENTRY(to_entry), to);
buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(body_view));
- gtk_text_buffer_set_text(buf, body, -1);
-
+ if (body) {
+ gtk_text_buffer_set_text(buf, body, -1);
+ } else {
+ gtk_text_buffer_set_text(buf, "", -1);
+ }
g_signal_connect (win, "destroy", G_CALLBACK(hide_edit_window),
NULL);
}
void
-on_account_selector_selection_changed(GtkWidget *widget,
- gpointer user_data)
+on_account_selector_selection_changed (GtkWidget *widget,
+ gpointer user_data)
{
GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
GtkTreeIter iter;
g_object_unref(glade_xml);
}
-
static void
on_folder_clicked (ModestTnyFolderTreeView *folder_tree,
TnyMsgFolderIface *folder,
modest_ui_show_edit_window (modest_ui, "", "", "", "", "", NULL);
}
-static gchar*
-modest_ui_quote_msg(const TnyMsgIface *src)
+
+static gchar *
+modest_ui_quote_msg(const TnyMsgIface *src, const gchar *from, time_t sent_date)
{
GList *parts;
TnyMsgMimePartIface *part;
TnyTextBufferStream *dest;
TnyMsgMimePartIface *body = NULL;
GtkTextBuffer *buf;
- GtkTextIter begin, end, iter1, iter2, iter3;
- gchar *txt, *line;
- gint tmp;
- gint indent;
- gboolean break_line;
-
+ gint limit = 76; /* TODO: make configurable */
+ gchar *quoted;
+
buf = gtk_text_buffer_new(NULL);
dest = tny_text_buffer_stream_new(buf);
+
+ /* is the warning in this line due to a bug in tinymail? */
parts = (GList*) tny_msg_iface_get_parts (src);
while (parts) {
parts = parts->next;
}
if (!body) {
- return "";
+ return NULL;
}
buf = gtk_text_buffer_new (NULL);
stream = TNY_STREAM_IFACE(tny_text_buffer_stream_new (buf));
tny_msg_mime_part_iface_decode_to_stream (body, stream);
tny_stream_iface_reset (stream);
- gtk_text_buffer_get_iter_at_line(buf, &iter1, 0);
- while (TRUE) {
- /* at each beginning of this while, iter1 must be at the beginning of
- the (next) line to quote */
-
- /* debug */
- iter2 = iter1;
- gtk_text_iter_forward_to_line_end(&iter2);
- txt = gtk_text_buffer_get_text (buf, &iter1, &iter2, FALSE);
- printf("%s\n", txt);
- /* check whether line is already quoted */
- iter2 = iter1;
-
- gtk_text_iter_forward_word_end(&iter2);
- txt = gtk_text_buffer_get_text (buf, &iter1, &iter2, FALSE);
-
- /* 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) >= 48) {
-
- gtk_text_iter_set_line_offset(&iter2, 48);
-
- /* 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 brakepoint in line) */
- gtk_text_iter_backward_word_start(&iter2);
-
- /* check for one-word line (up to iter2), don't break then */
- if (!gtk_text_iter_compare(&iter1, &iter2) < 0) {
- gtk_text_iter_forward_word_end(&iter2); /*BUG*/
- }
-
- 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);
-
- gtk_text_iter_forward_line(&iter1);
-
- /* kill 1 space */
- iter2 = iter1;
- gtk_text_iter_forward_char(&iter2);
- 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 the next line is mergable: */
- iter3 = iter1;
- if (!gtk_text_iter_forward_line(&iter3)) {
- break;
- }
-
- /* iter3 ist 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_word_end(&iter2);
- txt = gtk_text_buffer_get_text(buf, &iter3, &iter2, FALSE);
- if (strcmp(txt, "> ") == 0) {
- continue;
- }
-
- /* now merge in the next line */
- if (!gtk_text_iter_forward_to_line_end(&iter1)) {
- break;
- }
- iter2 = iter1;
- gtk_text_iter_forward_char(&iter2);
-
- tmp = gtk_text_iter_get_offset(&iter1);
-
- /* do the merge */
- gtk_text_buffer_delete (buf, &iter1, &iter2);
- gtk_text_buffer_get_iter_at_offset(buf, &iter1, tmp);
-
- gtk_text_iter_set_line_offset(&iter1, 0);
-
- } else {
- /* line must not be broken, we're done. */
- if (!gtk_text_iter_forward_line(&iter1)) {
- break;
- }
- }
- } else {
- /* line was already quoted */
- if (!gtk_text_iter_forward_line(&iter1)) {
- break;
- }
- }
- }
-
- gtk_text_buffer_get_bounds (buf, &begin, &end);
- txt = gtk_text_buffer_get_text (buf, &begin, &end, FALSE);
-
- return txt;
+ quoted = modest_text_utils_quote (buf, from, sent_date, limit);
+
+ g_object_unref(stream);
+ g_object_unref(buf);
+ return quoted;
}
static void
modest_ui_reply_to_msg (ModestUI *modest_ui, TnyMsgHeaderIface *header,
ModestTnyMsgView *msg_view) {
- const gchar *subject, *from, *quoted;
const TnyMsgIface *msg;
const TnyMsgFolderIface *folder;
- gchar *re_sub;
-
+ GString *re_sub;
+ const gchar *subject, *from;
+ gchar *quoted;
+ time_t sent_date;
+
quoted = "";
if (header) {
folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header));
return;
}
subject = tny_msg_header_iface_get_subject(header);
- /* TODO: checks, free */
- re_sub = malloc(strlen(subject) + 5);
- strcpy (re_sub, "Re: ");
- strcat (re_sub, subject);
+ re_sub = g_string_new(subject);
+ g_string_prepend(re_sub, "Re: ");
/* FIXME: honor replyto, cc */
from = tny_msg_header_iface_get_from(header);
- quoted = modest_ui_quote_msg(msg);
-
+ sent_date = tny_msg_header_iface_get_date_sent(header);
+ quoted = modest_ui_quote_msg(msg, from, sent_date);
} else {
- printf("no header\n");
+ g_warning("no header");
return;
}
- modest_ui_show_edit_window (modest_ui, from, "FIXME:cc", /* bcc */ "", re_sub, quoted, NULL);
+ modest_ui_show_edit_window (modest_ui, from, /* cc */ "", /* bcc */ "", re_sub->str, quoted, NULL);
+ g_free(quoted);
+ g_string_free(re_sub, TRUE);
}
-/* WIP, testing az */
static void
on_reply_clicked (GtkWidget *widget, ModestUI *modest_ui)
{
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(header_view));
g_return_if_fail (sel);
- if (!gtk_tree_selection_get_selected (sel, &model, &iter))
+ if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
/* no message was selected. TODO: disable reply button in this case */
+ g_warning("nothing to reply to");
return;
+ }
gtk_tree_model_get (model, &iter,
TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN,
}
-
/* FIXME: truly evil --> we cannot really assume that
* there is only one edit window open...
*/
projects / modest / blobdiff