2007-05-30 [colin] 2.9.2cvs18

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index 3a0d58a27a0481001d41746fe697bef7b20c9aa6..9b01223ddb353e5d73dcff7a391ac34c88295909 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -122,6 +122,7 @@
 #include "message_search.h"
 #include "combobox.h"
 #include "hooks.h"
+#include "privacy.h"
 
 enum
 {
@@ -1040,7 +1041,12 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        pref_get_unescaped_pref(tmp, prefs_common.compose_subject_format);
 
                        subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+#ifdef USE_ASPELL
+                       quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account,
+                                       compose->gtkaspell);
+#else
                        quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account);
+#endif
                        quote_fmt_scan_string(tmp);
                        quote_fmt_parse();
 
@@ -1075,7 +1081,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        compose_quote_fmt(compose, dummyinfo,
                                          prefs_common.compose_body_format,
                                          NULL, tmp, FALSE, TRUE,
-                                                 _("New message body format error."));
+                                                 _("New message body format error at line %d."));
                        quote_fmt_reset_vartable();
 
                        g_free(tmp);
@@ -1437,7 +1443,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
                compose_quote_fmt(compose, compose->replyinfo,
                                  prefs_common.quotefmt,
                                  qmark, body, FALSE, TRUE,
-                                         _("Message reply format error."));
+                                         _("Message reply format error at line %d."));
                quote_fmt_reset_vartable();
        }
        if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
@@ -1554,7 +1560,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                compose_quote_fmt(compose, full_msginfo,
                                  prefs_common.fw_quotefmt,
                                  qmark, body, FALSE, TRUE,
-                                         _("Message forward format error."));
+                                         _("Message forward format error at line %d."));
                quote_fmt_reset_vartable();
                compose_attach_parts(compose, msginfo);
 
@@ -2049,7 +2055,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
        gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
 
        compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE, FALSE,
-                                         _("Message redirect format error."));
+                                         _("Message redirect format error at line %d."));
        quote_fmt_reset_vartable();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
 
@@ -2532,7 +2538,12 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
        }
 
        if (qmark != NULL) {
+#ifdef USE_ASPELL
+               quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+                               compose->gtkaspell);
+#else
                quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
                quote_fmt_scan_string(qmark);
                quote_fmt_parse();
 
@@ -2549,7 +2560,12 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
                        while (*trimmed_body == '\n')
                                trimmed_body++;
 
+#ifdef USE_ASPELL
+               quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account,
+                               compose->gtkaspell);
+#else
                quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account);
+#endif
                if (need_unescape) {
                        gchar *tmp = NULL;
 
@@ -2566,7 +2582,10 @@ static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
 
                buf = quote_fmt_get_buffer();
                if (buf == NULL) {
-                       alertpanel_error(err_msg);
+                       gint line = quote_fmt_get_line();
+                       gchar *msg = g_strdup_printf(err_msg, line);
+                       alertpanel_error(msg);
+                       g_free(msg);
                        goto error;
                }
        } else
@@ -4387,8 +4406,6 @@ gint compose_send(Compose *compose)
                g_free(msgpath);
        }
        if (!discard_window) {
-               compose->sending = FALSE;
-               compose_allow_user_actions (compose, TRUE);
                if (val != 0) {
                        if (!queued_removed)
                                folder_item_remove_msg(folder, msgnum);
@@ -4418,8 +4435,11 @@ gint compose_send(Compose *compose)
                                procmsg_msginfo_free(tmp);
                        }
                }
-               if (!discard_window)
+               if (!discard_window) {
+                       compose->sending = FALSE;
+                       compose_allow_user_actions (compose, TRUE);
                        compose_close(compose);
+               }
        } else {
                if (errstr) {
                        gchar *tmp = g_strdup_printf(_("%s\nUse \"Send queued messages\" from "
@@ -7047,7 +7067,7 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
        gchar *qmark;
        gchar *parsed_str = NULL;
        gint cursor_pos = 0;
-       const gchar *err_msg = _("Template body format error.");
+       const gchar *err_msg = _("Template body format error at line %d.");
        if (!tmpl) return;
 
        /* process the body */
@@ -7149,7 +7169,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
        }
 
        if (tmpl->to && *tmpl->to != '\0') {
+#ifdef USE_ASPELL
+               quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+                               compose->gtkaspell);
+#else
                quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
                quote_fmt_scan_string(tmpl->to);
                quote_fmt_parse();
 
@@ -7162,7 +7187,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
        }
 
        if (tmpl->cc && *tmpl->cc != '\0') {
+#ifdef USE_ASPELL
+               quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+                               compose->gtkaspell);
+#else
                quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
                quote_fmt_scan_string(tmpl->cc);
                quote_fmt_parse();
 
@@ -7175,7 +7205,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
        }
 
        if (tmpl->bcc && *tmpl->bcc != '\0') {
+#ifdef USE_ASPELL
+               quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+                               compose->gtkaspell);
+#else
                quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
                quote_fmt_scan_string(tmpl->bcc);
                quote_fmt_parse();
 
@@ -7189,7 +7224,12 @@ static void compose_template_apply_fields(Compose *compose, Template *tmpl)
 
        /* process the subject */
        if (tmpl->subject && *tmpl->subject != '\0') {
+#ifdef USE_ASPELL
+               quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+                               compose->gtkaspell);
+#else
                quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
                quote_fmt_scan_string(tmpl->subject);
                quote_fmt_parse();
 
@@ -9452,7 +9492,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                gtk_text_buffer_place_cursor(buffer, iter);
 
                compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE, FALSE,
-                                                 _("Quote format error."));
+                                                 _("Quote format error at line %d."));
                quote_fmt_reset_vartable();
                g_free(new_text);
                g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
@@ -9759,7 +9799,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
                if ( strcasecmp(header, prefs_common_translated_header_name("To:")) == 0 ) {
                        if ( newmsginfo->to == NULL ) {
                                newmsginfo->to = g_strdup(entry);
-                       } else {
+                       } else if (entry && *entry) {
                                gchar *tmp = g_strconcat(newmsginfo->to, ", ", entry, NULL);
                                g_free(newmsginfo->to);
                                newmsginfo->to = tmp;
@@ -9768,7 +9808,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
                if ( strcasecmp(header, prefs_common_translated_header_name("Cc:")) == 0 ) {
                        if ( newmsginfo->cc == NULL ) {
                                newmsginfo->cc = g_strdup(entry);
-                       } else {
+                       } else if (entry && *entry) {
                                gchar *tmp = g_strconcat(newmsginfo->cc, ", ", entry, NULL);
                                g_free(newmsginfo->cc);
                                newmsginfo->cc = tmp;
@@ -9778,7 +9818,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
                                                prefs_common_translated_header_name("Newsgroups:")) == 0 ) {
                        if ( newmsginfo->newsgroups == NULL ) {
                                newmsginfo->newsgroups = g_strdup(entry);
-                       } else {
+                       } else if (entry && *entry) {
                                gchar *tmp = g_strconcat(newmsginfo->newsgroups, ", ", entry, NULL);
                                g_free(newmsginfo->newsgroups);
                                newmsginfo->newsgroups = tmp;