#include "inc.h"
#include "message_search.h"
#include "combobox.h"
+#include "hooks.h"
enum
{
const gchar *fmt,
const gchar *qmark,
const gchar *body,
- gboolean rewrap);
+ gboolean rewrap,
+ gboolean need_unescape,
+ const gchar *err_msg);
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
guint action,
GtkWidget *widget);
static void compose_reply_change_mode (gpointer data,
- guint action,
+ ComposeMode action,
GtkWidget *widget);
static void compose_attach_drag_received_cb (GtkWidget *widget,
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
+static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
+
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
}
compose_add_field_list( compose, listAddress );
+ if (prefs_common.compose_with_format) {
+ MsgInfo* dummyinfo = NULL;
+
+ if ( prefs_common.compose_subject_format
+ && *prefs_common.compose_subject_format != '\0' )
+ {
+ gchar *subject = NULL;
+ gchar *tmp = NULL;
+ gchar *buf = NULL;
+
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(prefs_common.compose_subject_format)+1);
+ pref_get_unescaped_pref(tmp, prefs_common.compose_subject_format);
+
+ subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+ quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account);
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("New message subject format error."));
+ else
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
+ quote_fmt_reset_vartable();
+
+ g_free(subject);
+ g_free(tmp);
+ }
+
+ if ( prefs_common.compose_body_format
+ && *prefs_common.compose_body_format != '\0' )
+ {
+ GtkTextView *text;
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
+ gchar *tmp = NULL;
+
+ if ( dummyinfo == NULL )
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ text = GTK_TEXT_VIEW(compose->text);
+ buffer = gtk_text_view_get_buffer(text);
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
+ tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
+ compose_quote_fmt(compose, dummyinfo,
+ prefs_common.compose_body_format,
+ NULL, tmp, FALSE, TRUE,
+ _("New message body format error."));
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
+
+ procmsg_msginfo_free( dummyinfo );
+ }
+
if (attach_files) {
gint i;
gchar *file;
case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
debug_print("reply mode List\n");
- menu_set_active(ifactory, "/Options/Reply mode/List", TRUE);
+ menu_set_active(ifactory, "/Options/Reply mode/Mailing-list", TRUE);
break;
default:
break;
compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
- qmark, body, FALSE);
+ qmark, body, FALSE, TRUE,
+ _("Message reply format error."));
quote_fmt_reset_vartable();
}
if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
compose_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
- qmark, body, FALSE);
+ qmark, body, FALSE, TRUE,
+ _("Message forward format error."));
quote_fmt_reset_vartable();
compose_attach_parts(compose, msginfo);
msginfo->subject);
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
- compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE);
+ compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE, FALSE,
+ _("Message redirect format error."));
quote_fmt_reset_vartable();
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
const gchar *fmt, const gchar *qmark,
- const gchar *body, gboolean rewrap)
+ const gchar *body, gboolean rewrap,
+ gboolean need_unescape,
+ const gchar *err_msg)
{
- static MsgInfo dummyinfo;
+ MsgInfo* dummyinfo = NULL;
gchar *quote_str = NULL;
gchar *buf;
gboolean prev_autowrap;
SIGNAL_BLOCK(buffer);
- if (!msginfo)
- msginfo = &dummyinfo;
+ if (!msginfo) {
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+ msginfo = dummyinfo;
+ }
if (qmark != NULL) {
quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
}
if (fmt && *fmt != '\0') {
- gchar *tmp = NULL;
if (trimmed_body)
while (*trimmed_body == '\n')
trimmed_body++;
- /* decode \-escape sequences in the internal representation of the quote format */
- tmp = malloc(strlen(fmt)+1);
- pref_get_unescaped_pref(tmp, fmt);
-
quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account);
- quote_fmt_scan_string(tmp);
- quote_fmt_parse();
- g_free(tmp);
+ if (need_unescape) {
+ gchar *tmp = NULL;
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(fmt)+1);
+ pref_get_unescaped_pref(tmp, fmt);
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+ g_free(tmp);
+ } else {
+ quote_fmt_scan_string(fmt);
+ quote_fmt_parse();
+ }
buf = quote_fmt_get_buffer();
if (buf == NULL) {
- alertpanel_error(_("Message reply/forward format error."));
+ alertpanel_error(err_msg);
goto error;
}
} else
ok:
SIGNAL_UNBLOCK(buffer);
+ procmsg_msginfo_free( dummyinfo );
return buf;
}
}
}
+ if (hooks_invoke(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, compose))
+ return FALSE;
+
return TRUE;
}
gchar *qmark;
gchar *parsed_str = NULL;
gint cursor_pos = 0;
+ const gchar *err_msg = _("Template body format error.");
if (!tmpl) return;
/* process the body */
text = GTK_TEXT_VIEW(compose->text);
buffer = gtk_text_view_get_buffer(text);
- if (replace)
- gtk_text_buffer_set_text(buffer, "", -1);
+ if (tmpl->value) {
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
- mark = gtk_text_buffer_get_insert(buffer);
- gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ if (compose->replyinfo != NULL) {
+
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark, NULL, FALSE, FALSE, err_msg);
+
+ } else if (compose->fwdinfo != NULL) {
+
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+ parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
+ tmpl->value, qmark, NULL, FALSE, FALSE, err_msg);
- if (tmpl->value) {
- if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
- parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
- NULL, NULL, FALSE);
} else {
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
-
- if (compose->replyinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark, NULL, FALSE);
- else if (compose->fwdinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
- tmpl->value, qmark, NULL, FALSE);
- else
- parsed_str = NULL;
- }
- }
+ MsgInfo* dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ GtkTextIter start, end;
+ gchar *tmp = NULL;
+
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
+ tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
+ /* clear the buffer now */
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+
+ parsed_str = compose_quote_fmt(compose, dummyinfo,
+ tmpl->value, qmark, tmp, FALSE, FALSE, err_msg);
+ procmsg_msginfo_free( dummyinfo );
+
+ g_free( tmp );
+ }
+ } else {
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ }
+
if (replace && parsed_str && compose->account->auto_sig)
compose_insert_sig(compose, FALSE);
}
/* process the other fields */
+
compose_template_apply_fields(compose, tmpl);
quote_fmt_reset_vartable();
compose_changed_cb(NULL, compose);
void compose_template_apply_fields(Compose *compose, Template *tmpl)
{
- static MsgInfo dummyinfo;
+ MsgInfo* dummyinfo = NULL;
MsgInfo *msginfo = NULL;
gchar *buf = NULL;
msginfo = compose->replyinfo;
else if (compose->fwdinfo != NULL)
msginfo = compose->fwdinfo;
- else
- msginfo = &dummyinfo;
+ else {
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+ msginfo = dummyinfo;
+ }
if (tmpl->to && *tmpl->to != '\0') {
quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
}
}
+
+ procmsg_msginfo_free( dummyinfo );
}
static void compose_destroy(Compose *compose)
mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
gtk_text_buffer_place_cursor(buffer, iter);
- compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE);
+ compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE, FALSE,
+ _("Quote format error."));
quote_fmt_reset_vartable();
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
if (!account && prefs_common.forward_account_autosel) {
gchar cc[BUFFSIZE];
if (!procheader_get_header_from_msginfo
- (msginfo, cc,sizeof cc , "CC:")) { /* Found a CC header */
- extract_address(cc);
- account = account_find_from_address(cc);
+ (msginfo, cc,sizeof cc , "Cc:")) {
+ gchar *buf = cc + strlen("Cc:");
+ extract_address(buf);
+ account = account_find_from_address(buf);
+ }
+ }
+
+ if (!account && prefs_common.forward_account_autosel) {
+ gchar deliveredto[BUFFSIZE];
+ if (!procheader_get_header_from_msginfo
+ (msginfo, deliveredto,sizeof deliveredto , "Delivered-To:")) {
+ gchar *buf = deliveredto + strlen("Delivered-To:");
+ extract_address(buf);
+ account = account_find_from_address(buf);
}
}
return gtkut_text_view_search_string_backward(text, str, case_sens);
}
+/* allocate a msginfo structure and populate its data from a compose data structure */
+static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
+{
+ MsgInfo *newmsginfo;
+ GSList *list;
+ gchar buf[BUFFSIZE];
+
+ g_return_val_if_fail( compose != NULL, NULL );
+
+ newmsginfo = procmsg_msginfo_new();
+
+ /* date is now */
+ get_rfc822_date(buf, sizeof(buf));
+ newmsginfo->date = g_strdup(buf);
+
+ /* from */
+ if (compose->from_name) {
+ newmsginfo->from = gtk_editable_get_chars(GTK_EDITABLE(compose->from_name), 0, -1);
+ newmsginfo->fromname = procheader_get_fromname(newmsginfo->from);
+ }
+
+ /* subject */
+ if (compose->subject_entry)
+ newmsginfo->subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+
+ /* to, cc, reply-to, newsgroups */
+ for (list = compose->header_list; list; list = list->next) {
+ gchar *header = gtk_editable_get_chars(
+ GTK_EDITABLE(
+ GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
+ gchar *entry = gtk_editable_get_chars(
+ GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
+
+ if ( strcasecmp(header, (prefs_common.trans_hdr ? gettext("To:") : "To:")) == 0 ) {
+ if ( newmsginfo->to == NULL ) {
+ newmsginfo->to = g_strdup(entry);
+ } else {
+ gchar *tmp = g_strconcat(newmsginfo->to, ", ", entry, NULL);
+ g_free(newmsginfo->to);
+ newmsginfo->to = tmp;
+ }
+ } else
+ if ( strcasecmp(header, (prefs_common.trans_hdr ? gettext("Cc:") : "Cc:")) == 0 ) {
+ if ( newmsginfo->cc == NULL ) {
+ newmsginfo->cc = g_strdup(entry);
+ } else {
+ gchar *tmp = g_strconcat(newmsginfo->cc, ", ", entry, NULL);
+ g_free(newmsginfo->cc);
+ newmsginfo->cc = tmp;
+ }
+ } else
+ if ( strcasecmp(header,
+ (prefs_common.trans_hdr ? gettext("Newsgroups:") : "Newsgroups:")) == 0 ) {
+ if ( newmsginfo->newsgroups == NULL ) {
+ newmsginfo->newsgroups = g_strdup(entry);
+ } else {
+ gchar *tmp = g_strconcat(newmsginfo->newsgroups, ", ", entry, NULL);
+ g_free(newmsginfo->newsgroups);
+ newmsginfo->newsgroups = tmp;
+ }
+ }
+
+ g_free(header);
+ g_free(entry);
+ }
+
+ /* other data is unset */
+
+ return newmsginfo;
+}
+
/*
* End of Source.
*/
projects / claws.git / blobdiff