/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
const gchar *fmt,
const gchar *qmark,
const gchar *body,
- gboolean rewrap);
+ gboolean rewrap,
+ const gchar *err_msg);
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
static ComposeInsertResult compose_insert_file (Compose *compose,
const gchar *file);
-static void compose_attach_append (Compose *compose,
+static gboolean compose_attach_append (Compose *compose,
const gchar *file,
const gchar *type,
const gchar *content_type);
static void compose_create_header_entry (Compose *compose);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
+static void compose_remove_header_entries(Compose *compose);
+
static void compose_update_priority_menu_item(Compose * compose);
#if USE_ASPELL
static void compose_spell_menu_changed (void *data);
static void compose_set_priority_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_reply_change_mode (gpointer data,
+ guint action,
+ GtkWidget *widget);
static void compose_attach_drag_received_cb (GtkWidget *widget,
GdkDragContext *drag_context,
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},
NULL, NULL, 0, "<Branch>"},
#endif
{N_("/_Options"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Privacy System/None"), NULL, NULL, 0, "<RadioItem>"},
+ {N_("/_Options/Reply _mode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Reply _mode/_Normal"), NULL, compose_reply_change_mode, COMPOSE_REPLY, "<RadioItem>"},
+ {N_("/_Options/Reply _mode/_All"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_ALL, "/Options/Reply mode/Normal"},
+ {N_("/_Options/Reply _mode/_Sender"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_SENDER, "/Options/Reply mode/Normal"},
+ {N_("/_Options/Reply _mode/_Mailing-list"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_LIST, "/Options/Reply mode/Normal"},
+ {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/Privacy _System"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Privacy _System/None"), NULL, NULL, 0, "<RadioItem>"},
{N_("/_Options/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
{N_("/_Options/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
{N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
return compose_generic_new(account, mailto, NULL, attach_files, NULL);
}
-Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
+Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item, const gchar *mailto)
{
- return compose_generic_new(account, NULL, item, NULL, NULL);
+ return compose_generic_new(account, mailto, item, NULL, NULL);
}
Compose *compose_new_with_list( PrefsAccount *account, GList *listAddress )
} else {
if (mailto) {
compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
- } else if (item) {
+ } else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
}
/*
}
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,
+ _("New message body format error."));
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
+
+ procmsg_msginfo_free( dummyinfo );
+ }
+
if (attach_files) {
gint i;
gchar *file;
MsgInfo *msginfo;
guint list_len;
Compose *compose = NULL;
+ GtkItemFactory *ifactory = NULL;
+
g_return_val_if_fail(msginfo_list != NULL, NULL);
msginfo = (MsgInfo*)g_slist_nth_data(msginfo_list, 0);
default:
g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
}
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ compose->rmode = mode;
+ switch (compose->rmode) {
+ case COMPOSE_REPLY:
+ case COMPOSE_REPLY_WITH_QUOTE:
+ case COMPOSE_REPLY_WITHOUT_QUOTE:
+ case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+ debug_print("reply mode Normal\n");
+ menu_set_active(ifactory, "/Options/Reply mode/Normal", TRUE);
+ compose_reply_change_mode(compose, COMPOSE_REPLY, NULL); /* force update */
+ break;
+ case COMPOSE_REPLY_TO_SENDER:
+ case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+ case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+ debug_print("reply mode Sender\n");
+ menu_set_active(ifactory, "/Options/Reply mode/Sender", TRUE);
+ break;
+ case COMPOSE_REPLY_TO_ALL:
+ case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+ case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+ debug_print("reply mode All\n");
+ menu_set_active(ifactory, "/Options/Reply mode/All", TRUE);
+ break;
+ case COMPOSE_REPLY_TO_LIST:
+ 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/Mailing-list", TRUE);
+ break;
+ default:
+ break;
+ }
return compose;
}
}
if (compose_parse_header(compose, msginfo) < 0) return NULL;
- compose_reply_set_entry(compose, msginfo, to_all, to_ml,
- to_sender, followup_and_reply_to);
- compose_show_first_last_header(compose, TRUE);
textview = (GTK_TEXT_VIEW(compose->text));
textbuf = gtk_text_view_get_buffer(textview);
compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
- qmark, body, FALSE);
+ qmark, body, FALSE,
+ _("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,
+ _("Message forward format error."));
quote_fmt_reset_vartable();
compose_attach_parts(compose, msginfo);
gboolean use_encryption = FALSE;
gchar *privacy_system = NULL;
int priority = PRIORITY_NORMAL;
+ MsgInfo *replyinfo = NULL, *fwdinfo = NULL;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
priority = param;
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "RMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("RMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ replyinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "FMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("FMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ fwdinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
+ }
} else {
account = msginfo->folder->folder->account;
}
compose = compose_create(account, COMPOSE_REEDIT, batch);
+ compose->replyinfo = replyinfo;
+ compose->fwdinfo = fwdinfo;
+
compose->updating = TRUE;
compose->priority = priority;
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,
+ _("Message redirect format error."));
quote_fmt_reset_vartable();
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
gchar *body = NULL;
gchar *temp = NULL;
guint len = 0;
-
- scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body);
+ gchar *attach = NULL;
+
+ scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body, &attach);
if (to)
compose_entry_append(compose, to, COMPOSE_TO);
compose_wrap_all(compose);
}
+ if (attach) {
+ gchar *utf8_filename = conv_filename_to_utf8(attach);
+ if (utf8_filename) {
+ if (compose_attach_append(compose, attach, utf8_filename, NULL)) {
+ alertpanel_notice(_("The file '%s' has been attached."), attach);
+ }
+ g_free(utf8_filename);
+ } else {
+ alertpanel_error(_("Couldn't attach a file (charset conversion failed)."));
+ }
+ }
g_free(to);
g_free(cc);
g_free(subject);
g_free(body);
+ g_free(attach);
}
static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
extract_address(hentry[H_LIST_POST].body);
if (hentry[H_LIST_POST].body[0] != '\0') {
scan_mailto_url(hentry[H_LIST_POST].body,
- &to, NULL, NULL, NULL, NULL);
+ &to, NULL, NULL, NULL, NULL, NULL);
if (to) {
g_free(compose->ml_post);
compose->ml_post = to;
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,
+ 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);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(qmark);
quote_fmt_parse();
}
if (fmt && *fmt != '\0') {
- while (trimmed_body && strlen(trimmed_body) > 1
- && trimmed_body[0]=='\n')
- *trimmed_body++;
+ 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);
- quote_fmt_scan_string(fmt);
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account);
+ quote_fmt_scan_string(tmp);
quote_fmt_parse();
+ g_free(tmp);
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;
}
extract_address(my_addr1);
extract_address(my_addr2);
- return !strcmp(my_addr1, my_addr2);
+ return !strcasecmp(my_addr1, my_addr2);
}
static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
return COMPOSE_INSERT_SUCCESS;
}
-static void compose_attach_append(Compose *compose, const gchar *file,
+static gboolean compose_attach_append(Compose *compose, const gchar *file,
const gchar *filename,
const gchar *content_type)
{
gboolean has_binary = FALSE;
if (!is_file_exist(file)) {
- g_warning("File %s doesn't exist\n", filename);
- return;
+ alertpanel_error("File %s doesn't exist\n", filename);
+ return FALSE;
}
if ((size = get_file_size(file)) < 0) {
- g_warning("Can't get file size of %s\n", filename);
- return;
+ alertpanel_error("Can't get file size of %s\n", filename);
+ return FALSE;
}
if (size == 0) {
- alertpanel_notice(_("File %s is empty."), filename);
- return;
+ alertpanel_error(_("File %s is empty."), filename);
+ return FALSE;
}
if ((fp = g_fopen(file, "rb")) == NULL) {
alertpanel_error(_("Can't read %s."), filename);
- return;
+ return FALSE;
}
fclose(fp);
g_free(name);
}
+ if (ainfo->name != NULL
+ && !strcmp(ainfo->name, ".")) {
+ g_free(ainfo->name);
+ ainfo->name = NULL;
+ }
+
if (!strcmp(ainfo->content_type, "unknown") || has_binary) {
g_free(ainfo->content_type);
ainfo->content_type = g_strdup("application/octet-stream");
-1);
g_auto_pointer_free(auto_ainfo);
+ return TRUE;
}
static void compose_use_signing(Compose *compose, gboolean use_signing)
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
g_strstrip(entry);
- if (strcmp(entry, compose->account->auto_cc)
+ if (strcmp(entry, compose->account->auto_bcc)
|| strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
found_other = TRUE;
g_free(entry);
gchar *msgpath = NULL;
gboolean discard_window = FALSE;
gchar *errstr = NULL;
+ gchar *tmsgid = NULL;
MainWindow *mainwin = mainwindow_get_mainwindow();
if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
goto bail;
}
+ inc_lock();
val = compose_queue(compose, &msgnum, &folder, &msgpath, TRUE);
if (val) {
if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
} else if (val == -3) {
if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
goto bail;
}
+ tmsgid = g_strdup(compose->msgid);
if (discard_window) {
compose->sending = FALSE;
compose_close(compose);
if (!discard_window) {
goto bail;
}
+ inc_unlock();
+ g_free(tmsgid);
return -1;
}
-
if (msgpath == NULL) {
msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath, &errstr);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
g_free(msgpath);
} else {
- val = procmsg_send_message_queue(msgpath, &errstr);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
g_unlink(msgpath);
g_free(msgpath);
}
if (val != 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
+ if (tmsgid) {
+ /* make sure we delete that */
+ MsgInfo *tmp = folder_item_get_msginfo_by_msgid(folder, tmsgid);
+ if (tmp) {
+ debug_print("removing %d via %s\n", tmp->msgnum, tmsgid);
+ folder_item_remove_msg(folder, tmp->msgnum);
+ procmsg_msginfo_free(tmp);
+ }
+ }
}
}
if (val == 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
+ if (tmsgid) {
+ /* make sure we delete that */
+ MsgInfo *tmp = folder_item_get_msginfo_by_msgid(folder, tmsgid);
+ if (tmp) {
+ debug_print("removing %d via %s\n", tmp->msgnum, tmsgid);
+ folder_item_remove_msg(folder, tmp->msgnum);
+ procmsg_msginfo_free(tmp);
+ }
+ }
if (!discard_window)
compose_close(compose);
} else {
if (!discard_window) {
goto bail;
}
+ inc_unlock();
+ g_free(tmsgid);
return -1;
}
-
+ g_free(tmsgid);
+ inc_unlock();
toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
return 0;
bail:
+ inc_unlock();
+ g_free(tmsgid);
compose_allow_user_actions (compose, TRUE);
compose->sending = FALSE;
compose->modified = TRUE;
FILE *fp;
size_t len;
gchar buf[BUFFSIZE];
-
+ int i = 0;
+ gboolean skip = FALSE;
+ gchar *not_included[]={
+ "Return-Path:", "Delivered-To:", "Received:",
+ "Subject:", "X-UIDL:", "AF:",
+ "NF:", "PS:", "SRH:",
+ "SFN:", "DSR:", "MID:",
+ "CFG:", "PT:", "S:",
+ "RQ:", "SSV:", "NSV:",
+ "SSH:", "R:", "MAID:",
+ "NAID:", "RMID:", "FMID:",
+ "SCF:", "RRCPT:", "NG:",
+ "X-Sylpheed-Privacy", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt",
+ "X-Sylpheed-End-Special-Headers:",
+ NULL
+ };
if ((fp = g_fopen(compose->redirect_filename, "rb")) == NULL) {
FILE_OP_ERROR(compose->redirect_filename, "fopen");
return -1;
}
while (procheader_get_one_field_asis(buf, sizeof(buf), fp) != -1) {
- /* should filter returnpath, delivered-to */
- if (g_ascii_strncasecmp(buf, "Return-Path:",
- strlen("Return-Path:")) == 0 ||
- g_ascii_strncasecmp(buf, "Delivered-To:",
- strlen("Delivered-To:")) == 0 ||
- g_ascii_strncasecmp(buf, "Received:",
- strlen("Received:")) == 0 ||
- g_ascii_strncasecmp(buf, "Subject:",
- strlen("Subject:")) == 0 ||
- g_ascii_strncasecmp(buf, "X-UIDL:",
- strlen("X-UIDL:")) == 0)
+ skip = FALSE;
+ for (i = 0; not_included[i] != NULL; i++) {
+ if (g_ascii_strncasecmp(buf, not_included[i],
+ strlen(not_included[i])) == 0) {
+ skip = TRUE;
+ break;
+ }
+ }
+ if (skip)
continue;
-
if (fputs(buf, fdest) == -1)
goto error;
mimetext = procmime_mimeinfo_new();
mimetext->content = MIMECONTENT_MEM;
mimetext->tmp = TRUE; /* must free content later */
- mimetext->data.mem = buf;
+ /* dup'ed because procmime_encode_content can turn it into a tmpfile
+ * and free the data, which we need later. */
+ mimetext->data.mem = g_strdup(buf);
mimetext->type = MIMETYPE_TEXT;
mimetext->subtype = g_strdup("plain");
g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
aval = alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
g_free(msg);
if (aval != G_ALERTALTERNATE) {
+ g_free(buf);
return -1;
}
}
} else
g_node_append(mimemsg->node, mimetext->node);
+ g_free(buf);
+
/* sign message if sending */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system))
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
+ lock = FALSE;
+ fclose(fp);
+ g_unlink(tmp);
+ g_free(tmp);
+ return -5;
}
g_free(encdata);
}
!g_ascii_strcasecmp(mimepart->subtype, "rfc822")) {
mimepart->disposition = DISPOSITIONTYPE_INLINE;
} else {
- g_hash_table_insert(mimepart->typeparameters,
+ if (ainfo->name) {
+ g_hash_table_insert(mimepart->typeparameters,
g_strdup("name"), g_strdup(ainfo->name));
- g_hash_table_insert(mimepart->dispositionparameters,
+ g_hash_table_insert(mimepart->dispositionparameters,
g_strdup("filename"), g_strdup(ainfo->name));
- mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
+ mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
+ }
}
if (compose->use_signing) {
G_CALLBACK(compose_drag_drop),
compose);
- address_completion_register_entry(GTK_ENTRY(entry));
+ address_completion_register_entry(GTK_ENTRY(entry), TRUE);
headerentry->compose = compose;
headerentry->combo = combo;
gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
}
+static void compose_remove_header_entries(Compose *compose)
+{
+ GSList *list;
+ for (list = compose->header_list; list; list = list->next) {
+ ComposeHeaderEntry *headerentry =
+ (ComposeHeaderEntry *)list->data;
+ gtk_widget_destroy(headerentry->combo);
+ gtk_widget_destroy(headerentry->entry);
+ g_free(headerentry);
+ }
+ g_slist_free(compose->header_list);
+ compose->header_list = NULL;
+ compose->header_nextrow = 1;
+ compose_create_header_entry(compose);
+}
+
static GtkWidget *compose_create_header(Compose *compose)
{
GtkWidget *from_optmenu_hbox;
gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
compose->tmpl_menu = tmpl_menu;
compose->mode = mode;
+ compose->rmode = mode;
compose->targetinfo = NULL;
compose->replyinfo = NULL;
if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO);
+ menu_set_sensitive(ifactory, "/Options/Reply mode", compose->mode == COMPOSE_REPLY);
if (account->protocol != A_NNTP)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
compose->priority = action;
}
+static void compose_reply_change_mode(gpointer data,
+ ComposeMode action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *) data;
+ gboolean was_modified = compose->modified;
+
+ gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;
+ if (compose->mode != COMPOSE_REPLY)
+ return;
+ g_return_if_fail(compose->replyinfo != NULL);
+
+ if (action == COMPOSE_REPLY && prefs_common.default_reply_list)
+ ml = TRUE;
+ if (action == COMPOSE_REPLY && compose->rmode == COMPOSE_FOLLOWUP_AND_REPLY_TO)
+ followup = TRUE;
+ if (action == COMPOSE_REPLY_TO_ALL)
+ all = TRUE;
+ if (action == COMPOSE_REPLY_TO_SENDER)
+ sender = TRUE;
+ if (action == COMPOSE_REPLY_TO_LIST)
+ ml = TRUE;
+
+ compose_remove_header_entries(compose);
+ compose_reply_set_entry(compose, compose->replyinfo, all, ml, sender, followup);
+ compose_show_first_last_header(compose, TRUE);
+ compose->modified = was_modified;
+ compose_set_title(compose);
+}
+
static void compose_update_priority_menu_item(Compose * compose)
{
GtkItemFactory *ifactory;
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, 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, 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, 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);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->to);
quote_fmt_parse();
}
if (tmpl->cc && *tmpl->cc != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->cc);
quote_fmt_parse();
}
if (tmpl->bcc && *tmpl->bcc != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->bcc);
quote_fmt_parse();
/* process the subject */
if (tmpl->subject && *tmpl->subject != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->subject);
quote_fmt_parse();
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
}
}
+
+ procmsg_msginfo_free( dummyinfo );
}
static void compose_destroy(Compose *compose)
{
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
+
compose_list = g_list_remove(compose_list, compose);
if (compose->updating) {
gtk_widget_destroy(compose->paned);
gtk_widget_destroy(compose->popupmenu);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_remove_selection_clipboard(buffer, clipboard);
+
gtk_widget_destroy(compose->window);
toolbar_destroy(compose->toolbar);
g_free(compose->toolbar);
if (prefs_common.work_offline &&
!inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ _("Claws Mail needs network access in order "
"to send this email.")))
return;
Compose *compose = (Compose *)data;
gint val;
+ inc_lock();
val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
+ inc_unlock();
+
if (!val) {
compose_close(compose);
} else if (val == -1) {
} else if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
}
toolbar_main_set_sensitive(mainwindow_get_mainwindow());
}
if (gdk_atom_name(data->type) &&
!strcmp(gdk_atom_name(data->type), "text/uri-list")
&& gtk_drag_get_source_widget(context) !=
- mainwindow_get_mainwindow()->summaryview->ctree) {
+ summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next)
compose_attach_append
list_free_strings(list);
g_list_free(list);
} else if (gtk_drag_get_source_widget(context)
- == mainwindow_get_mainwindow()->summaryview->ctree) {
+ == summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
/* comes from our summaryview */
SummaryView * summaryview = NULL;
GSList * list = NULL, *cur = NULL;
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,
+ _("Quote format error."));
quote_fmt_reset_vartable();
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
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.
*/