#include "statusbar.h"
#include "about.h"
#include "base64.h"
+#include "quoted-printable.h"
#include "codeconv.h"
#include "utils.h"
#include "gtkutils.h"
static void compose_insert_sig (Compose *compose);
static void compose_insert_file (Compose *compose,
const gchar *file);
+static void compose_insert_command_output (Compose *compose,
+ const gchar *cmdline);
static void compose_attach_append (Compose *compose,
const gchar *file,
const gchar *type,
Compose *compose);
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all, gboolean to_ml,
- gboolean ignore_replyto,
+ gboolean to_sender,
gboolean followup_and_reply_to,
const gchar *body);
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose->replyinfo = NULL;
+ compose->fwdinfo = NULL;
text = GTK_STEXT(compose->text);
gtk_stext_freeze(text);
- if (prefs_common.auto_sig)
+ if (account->auto_sig)
compose_insert_sig(compose);
gtk_editable_set_position(GTK_EDITABLE(text), 0);
gtk_stext_set_point(text, 0);
}
*/
+void compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
+{
+ MsgInfo *msginfo;
+ guint list_len;
+
+ g_return_if_fail(msginfo_list != NULL);
+
+ msginfo = (MsgInfo*)g_slist_nth_data(msginfo_list, 0);
+ g_return_if_fail(msginfo != NULL);
+
+ list_len = g_slist_length(msginfo_list);
+
+ switch (mode) {
+ case COMPOSE_REPLY:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, prefs_common.default_reply_list, FALSE, body);
+ break;
+ case COMPOSE_REPLY_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, prefs_common.default_reply_list, FALSE, body);
+ break;
+ case COMPOSE_REPLY_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, prefs_common.default_reply_list, FALSE, NULL);
+ break;
+ case COMPOSE_REPLY_TO_SENDER:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE, TRUE, body);
+ break;
+ case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+ compose_followup_and_reply_to(msginfo,
+ prefs_common.reply_with_quote,
+ FALSE, FALSE, body);
+ break;
+ case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, body);
+ break;
+ case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
+ break;
+ case COMPOSE_REPLY_TO_ALL:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ TRUE, FALSE, FALSE, body);
+ break;
+ case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, body);
+ break;
+ case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
+ break;
+ case COMPOSE_REPLY_TO_LIST:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE, FALSE, body);
+ break;
+ case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, body);
+ break;
+ case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
+ break;
+ case COMPOSE_FORWARD:
+ if (prefs_common.forward_as_attachment) {
+ compose_reply_mode(COMPOSE_FORWARD_AS_ATTACH, msginfo_list, body);
+ return;
+ } else {
+ compose_reply_mode(COMPOSE_FORWARD_INLINE, msginfo_list, body);
+ return;
+ }
+ break;
+ case COMPOSE_FORWARD_INLINE:
+ /* check if we reply to more than one Message */
+ if (list_len == 1) {
+ compose_forward(NULL, msginfo, FALSE, body);
+ break;
+ }
+ /* more messages FALL THROUGH */
+ case COMPOSE_FORWARD_AS_ATTACH:
+ compose_forward_multiple(NULL, msginfo_list);
+ break;
+ case COMPOSE_REDIRECT:
+ compose_redirect(NULL, msginfo);
+ break;
+ default:
+ g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
+ }
+}
+
void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
- gboolean to_ml, gboolean ignore_replyto,
+ gboolean to_ml, gboolean to_sender,
const gchar *body)
{
compose_generic_reply(msginfo, quote, to_all, to_ml,
- ignore_replyto, FALSE, body);
+ to_sender, FALSE, body);
}
void compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
- gboolean ignore_replyto,
+ gboolean to_sender,
const gchar *body)
{
compose_generic_reply(msginfo, quote, to_all, FALSE,
- ignore_replyto, TRUE, body);
+ to_sender, TRUE, body);
}
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all, gboolean to_ml,
- gboolean ignore_replyto,
+ gboolean to_sender,
gboolean followup_and_reply_to,
const gchar *body)
{
g_return_if_fail(account != NULL);
- if (ignore_replyto && account->protocol == A_NNTP &&
+ if (to_sender && account->protocol == A_NNTP &&
!followup_and_reply_to) {
reply_account =
account_find_from_address(account->address);
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reply_set_entry(compose, msginfo, to_all, to_ml,
- ignore_replyto, followup_and_reply_to);
+ to_sender, followup_and_reply_to);
compose_show_first_last_header(compose, TRUE);
text = GTK_STEXT(compose->text);
qmark, body);
}
- if (prefs_common.auto_sig)
+ if (account->auto_sig)
compose_insert_sig(compose);
if (quote && prefs_common.linewrap_quote)
}
g_return_val_if_fail(account != NULL, NULL);
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
-
compose = compose_create(account, COMPOSE_FORWARD);
+ compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);
+ if (!compose->fwdinfo)
+ compose->fwdinfo = procmsg_msginfo_copy(msginfo);
+
if (msginfo->subject && *msginfo->subject) {
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), "Fw: ");
gtk_entry_append_text(GTK_ENTRY(compose->subject_entry),
procmsg_msginfo_free(full_msginfo);
}
- if (prefs_common.auto_sig)
+ if (account->auto_sig)
compose_insert_sig(compose);
if (prefs_common.linewrap_quote)
g_free(msgfile);
}
- if (prefs_common.auto_sig)
+ if (account->auto_sig)
compose_insert_sig(compose);
if (prefs_common.linewrap_quote)
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose->replyinfo = NULL;
+ compose->fwdinfo = NULL;
compose_show_first_last_header(compose, TRUE);
hentry[H_BCC].body = NULL;
}
if (hentry[H_NEWSGROUPS].body != NULL) {
+ conv_unmime_header_overwrite(hentry[H_NEWSGROUPS].body);
compose->newsgroups = hentry[H_NEWSGROUPS].body;
hentry[H_NEWSGROUPS].body = NULL;
}
static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
gboolean to_all, gboolean to_ml,
- gboolean ignore_replyto,
+ gboolean to_sender,
gboolean followup_and_reply_to)
{
GSList *cc_list = NULL;
g_return_if_fail(compose->account != NULL);
g_return_if_fail(msginfo != NULL);
- if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
+ if (compose->account->protocol != A_NNTP) {
if (!compose->replyto && to_ml && compose->ml_post
&& !(msginfo->folder && msginfo->folder->prefs->enable_default_reply_to))
compose_entry_append(compose,
compose->ml_post,
COMPOSE_TO);
- else if (!(to_all || ignore_replyto)
+ else if (!(to_all || to_sender)
&& msginfo->folder
&& msginfo->folder->prefs->enable_default_reply_to) {
compose_entry_append(compose,
COMPOSE_TO);
} else
compose_entry_append(compose,
- (compose->replyto && !ignore_replyto)
- ? compose->replyto
- : msginfo->from ? msginfo->from : "",
- COMPOSE_TO);
+ (compose->replyto && !to_sender)
+ ? compose->replyto :
+ msginfo->from ? msginfo->from : "",
+ COMPOSE_TO);
} else {
- if (ignore_replyto)
+ if (to_sender || (compose->followup_to &&
+ !strncmp(compose->followup_to, "poster", 6)))
compose_entry_append
- (compose, msginfo->from ? msginfo->from : "",
+ (compose,
+ (compose->replyto ? compose->replyto :
+ msginfo->from ? msginfo->from : ""),
COMPOSE_TO);
- else {
- if (compose->followup_to && !strncmp(compose->followup_to, "poster", 6)) {
- compose_entry_append
- (compose,
- ((compose->replyto && !ignore_replyto)
- ? compose->replyto
- : msginfo->from ? msginfo->from : ""),
- COMPOSE_TO);
- } else {
- compose_entry_append
- (compose,
- compose->followup_to ? compose->followup_to
- : compose->newsgroups ? compose->newsgroups
- : "",
- COMPOSE_NEWSGROUPS);
- }
- }
+
+ else if (followup_and_reply_to || to_all) {
+ compose_entry_append
+ (compose,
+ (compose->replyto ? compose->replyto :
+ msginfo->from ? msginfo->from : ""),
+ COMPOSE_TO);
+
+ compose_entry_append
+ (compose,
+ compose->followup_to ? compose->followup_to :
+ compose->newsgroups ? compose->newsgroups : "",
+ COMPOSE_NEWSGROUPS);
+ }
+ else
+ compose_entry_append
+ (compose,
+ compose->followup_to ? compose->followup_to :
+ compose->newsgroups ? compose->newsgroups : "",
+ COMPOSE_NEWSGROUPS);
}
if (msginfo->subject && *msginfo->subject) {
}
if (replyto && from)
- cc_list = address_list_append(cc_list, from);
- cc_list = address_list_append(cc_list, msginfo->to);
- cc_list = address_list_append(cc_list, compose->cc);
+ cc_list = address_list_append_with_comments(cc_list, from);
+ cc_list = address_list_append_with_comments(cc_list, msginfo->to);
+ cc_list = address_list_append_with_comments(cc_list, compose->cc);
to_table = g_hash_table_new(g_str_hash, g_str_equal);
if (replyto)
- g_hash_table_insert(to_table, replyto, GINT_TO_POINTER(1));
+ g_hash_table_insert(to_table, g_strdup(replyto), GINT_TO_POINTER(1));
if (compose->account)
- g_hash_table_insert(to_table, compose->account->address,
+ g_hash_table_insert(to_table, g_strdup(compose->account->address),
GINT_TO_POINTER(1));
/* remove address on To: and that of current account */
for (cur = cc_list; cur != NULL; ) {
GSList *next = cur->next;
+ gchar *addr;
+
+ addr = g_strdup(cur->data);
+ extract_address(addr);
- if (g_hash_table_lookup(to_table, cur->data) != NULL)
+ if (GPOINTER_TO_INT(g_hash_table_lookup(to_table, addr)) == 1)
cc_list = g_slist_remove(cc_list, cur->data);
else
- g_hash_table_insert(to_table, cur->data, cur);
+ g_hash_table_insert(to_table, addr, GINT_TO_POINTER(1));
cur = next;
}
+ hash_free_strings(to_table);
g_hash_table_destroy(to_table);
if (cc_list) {
SET_ADDRESS(COMPOSE_CC, compose->cc);
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
+ SET_ADDRESS(COMPOSE_NEWSGROUPS, compose->newsgroups);
+ SET_ADDRESS(COMPOSE_FOLLOWUPTO, compose->followup_to);
compose_update_priority_menu_item(compose);
#if USE_GPGME
#undef SET_ENTRY
#undef SET_ADDRESS
-static void compose_exec_sig(Compose *compose, gchar *sigfile)
+static void compose_insert_sig(Compose *compose)
{
- FILE *sigprg;
- gchar *buf;
- size_t buf_len = 128;
-
- if (strlen(sigfile) < 2)
- return;
-
- sigprg = popen(sigfile+1, "r");
- if (sigprg) {
-
- buf = g_malloc(buf_len);
+ static gchar *default_sigfile;
+ gchar *sigfile = NULL;
- if (!buf) {
- gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
- "Unable to insert signature (malloc failed)\n", -1);
+ g_return_if_fail(compose->account != NULL);
- pclose(sigprg);
- return;
+ if (compose->account->sig_type == SIG_FILE) {
+ if (compose->account->sig_path)
+ sigfile = compose->account->sig_path;
+ else {
+ if (!default_sigfile)
+ default_sigfile = g_strconcat
+ (get_home_dir(), G_DIR_SEPARATOR_S,
+ DEFAULT_SIGNATURE, NULL);
+ sigfile = default_sigfile;
}
- while (!feof(sigprg)) {
- bzero(buf, buf_len);
- fread(buf, buf_len-1, 1, sigprg);
- gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, buf, -1);
+ if (!is_file_or_fifo_exist(sigfile)) {
+ g_warning("can't open signature file: %s\n", sigfile);
+ return;
}
-
- g_free(buf);
- pclose(sigprg);
- }
- else
- {
- gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
- "Can't exec file: ", -1);
- gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
- sigfile+1, -1);
- }
-}
-
-static void compose_insert_sig(Compose *compose)
-{
- gchar *sigfile;
-
- if (compose->account && compose->account->sig_path)
- sigfile = g_strdup(compose->account->sig_path);
- else
- sigfile = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
- DEFAULT_SIGNATURE, NULL);
-
- if (!is_file_or_fifo_exist(sigfile) && sigfile[0] != '|') {
- g_free(sigfile);
- return;
}
gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, "\n\n", 2);
- if (prefs_common.sig_sep) {
+ if (compose->account->sig_sep) {
gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL,
- prefs_common.sig_sep, -1);
+ compose->account->sig_sep, -1);
gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL,
"\n", 1);
}
- if (sigfile[0] == '|')
- compose_exec_sig(compose, sigfile);
- else
+ if (compose->account->sig_type == SIG_COMMAND) {
+ if (compose->account->sig_path)
+ compose_insert_command_output
+ (compose, compose->account->sig_path);
+ } else
compose_insert_file(compose, sigfile);
- g_free(sigfile);
}
static void compose_insert_file(Compose *compose, const gchar *file)
fclose(fp);
}
+static void compose_insert_command_output(Compose *compose,
+ const gchar *cmdline)
+{
+ GtkSText *text = GTK_STEXT(compose->text);
+ gchar buf[BUFFSIZE];
+ gint len;
+ FILE *fp;
+
+ g_return_if_fail(cmdline != NULL);
+
+ if ((fp = popen(cmdline, "r")) == NULL) {
+ FILE_OP_ERROR(cmdline, "popen");
+ return;
+ }
+
+ gtk_stext_freeze(text);
+
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ strcrchomp(buf);
+ len = strlen(buf);
+ if (len > 0 && buf[len - 1] != '\n') {
+ while (--len >= 0)
+ if (buf[len] == '\r') buf[len] = '\n';
+ }
+ gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ }
+
+ gtk_stext_thaw(text);
+
+ pclose(fp);
+}
+
static void compose_attach_append(Compose *compose, const gchar *file,
const gchar *filename,
const gchar *content_type)
if (content_type) {
ainfo->content_type = g_strdup(content_type);
if (!strcasecmp(content_type, "message/rfc822")) {
- ainfo->encoding = ENC_7BIT;
+ if (procmime_get_encoding_for_file(file) == ENC_7BIT)
+ ainfo->encoding = ENC_7BIT;
+ else
+ ainfo->encoding = ENC_8BIT;
ainfo->name = g_strdup_printf
(_("Message: %s"),
g_basename(filename ? filename : file));
alertpanel_error(_("Could not queue message for sending"));
return -1;
}
+
+ if (msgnum == 0) {
+ alertpanel_error(_("The message was queued but could not be sent.\nUse \"Send queued messages\" from the main window to retry."));
+ return 0;
+ }
msgpath = folder_item_fetch_msg(folder, msgnum);
val = procmsg_send_message_queue(msgpath);
return -1;
}
- if (canonicalize_file_replace(tmp_file) < 0 ||
- compose_create_signers_list(compose, &key_list) < 0 ||
+ if (compose_create_signers_list(compose, &key_list) < 0 ||
rfc2015_clearsign(tmp_file, key_list) < 0) {
unlink(tmp_file);
g_free(tmp_file);
size_t len;
gchar *chars;
gchar *buf;
+ gchar *canon_buf;
const gchar *out_codeset;
EncodingType encoding;
out_codeset = conv_get_outgoing_charset_str();
if (!strcasecmp(out_codeset, CS_US_ASCII))
out_codeset = CS_ISO_8859_1;
- encoding = procmime_get_encoding_for_charset(out_codeset);
+
+ if (prefs_common.encoding_method == CTE_BASE64)
+ encoding = ENC_BASE64;
+ else if (prefs_common.encoding_method == CTE_QUOTED_PRINTABLE)
+ encoding = ENC_QUOTED_PRINTABLE;
+ else if (prefs_common.encoding_method == CTE_8BIT)
+ encoding = ENC_8BIT;
+ else
+ encoding = procmime_get_encoding_for_charset(out_codeset);
#if USE_GPGME
if (!is_draft &&
buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!buf) {
AlertValue aval;
+ gchar *msg;
+ msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
+ "%s to %s.\n"
+ "Send it anyway?"), src_codeset, out_codeset);
aval = alertpanel
- (_("Error"),
- _("Can't convert the character encoding of the message.\n"
- "Send it anyway?"), _("Yes"), _("+No"), NULL);
+ (_("Error"), msg, _("Yes"), _("+No"), NULL);
+ g_free(msg);
+
if (aval != G_ALERTDEFAULT) {
g_free(chars);
fclose(fp);
}
g_free(chars);
- /* Canonicalize line endings in the message text */
- {
- gchar *canon_buf, *out;
- const gchar *p;
- guint new_len = 0;
-
- for (p = buf ; *p; ++p) {
- if (*p != '\r') {
- ++new_len;
- if (*p == '\n')
- ++new_len;
- }
- }
-
- out = canon_buf = g_new(gchar, new_len + 1);
- for (p = buf; *p; ++p) {
- if (*p != '\r') {
- if (*p == '\n')
- *out++ = '\r';
- *out++ = *p;
- }
- }
- *out = '\0';
-
- free(buf);
- buf = canon_buf;
- }
+ canon_buf = canonicalize_str(buf);
+ g_free(buf);
+ buf = canon_buf;
#if USE_GPGME
if (!is_draft && compose->use_signing && compose->gnupg_mode) {
fputs(outbuf, fp);
fputc('\n', fp);
}
+ } else if (encoding == ENC_QUOTED_PRINTABLE) {
+ gchar *outbuf;
+ size_t outlen;
+
+ outbuf = g_malloc(len * 4);
+ qp_encode_line(outbuf, buf);
+ outlen = strlen(outbuf);
+ if (fwrite(outbuf, sizeof(gchar), outlen, fp) != outlen) {
+ FILE_OP_ERROR(file, "fwrite");
+ fclose(fp);
+ unlink(file);
+ g_free(outbuf);
+ g_free(buf);
+ return -1;
+ }
+ g_free(outbuf);
} else if (fwrite(buf, sizeof(gchar), len, fp) != len) {
FILE_OP_ERROR(file, "fwrite");
fclose(fp);
}
#if USE_GPGME
- if (is_draft)
+ if (is_draft) {
+ uncanonicalize_file_replace(file);
return 0;
+ }
if ((compose->use_signing && !compose->gnupg_mode) ||
compose->use_encryption) {
}
#endif /* USE_GPGME */
+ uncanonicalize_file_replace(file);
+
return 0;
}
g_return_val_if_fail(item != NULL, -1);
if (procmsg_msg_exist(msginfo) &&
- (item->stype == F_DRAFT || item->stype == F_QUEUE)) {
+ (item->stype == F_DRAFT || item->stype == F_QUEUE
+ || msginfo == compose->autosaved_draft)) {
if (folder_item_remove_msg(item, msginfo->msgnum) < 0) {
g_warning("can't remove the old message\n");
return -1;
fprintf(fp, "RMID:%s\x7f%d\x7f%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid);
g_free(folderid);
}
+ /* Message-ID of message forwarding to */
+ if ((compose->fwdinfo != NULL) && (compose->fwdinfo->msgid != NULL)) {
+ gchar *folderid;
+
+ folderid = folder_item_get_identifier(compose->fwdinfo->folder);
+ fprintf(fp, "FMID:%s\x7f%d\x7f%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
+ g_free(folderid);
+ }
fprintf(fp, "\n");
while (fgets(buf, sizeof(buf), src_fp) != NULL) {
for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
row++) {
- gchar buf[BUFFSIZE];
- gchar inbuf[B64_LINE_SIZE], outbuf[B64_BUFFSIZE];
-
if ((attach_fp = fopen(ainfo->file, "rb")) == NULL) {
g_warning("Can't open file %s\n", ainfo->file);
continue;
fprintf(fp, "Content-Transfer-Encoding: %s\n\n",
procmime_get_encoding_str(ainfo->encoding));
- switch (ainfo->encoding) {
-
- case ENC_7BIT:
- case ENC_8BIT:
- /* if (ainfo->encoding == ENC_7BIT) { */
-
- while (fgets(buf, sizeof(buf), attach_fp) != NULL) {
- strcrchomp(buf);
- fputs(buf, fp);
- }
- break;
- /* } else { */
- case ENC_BASE64:
+ if (ainfo->encoding == ENC_BASE64) {
+ gchar inbuf[B64_LINE_SIZE], outbuf[B64_BUFFSIZE];
while ((len = fread(inbuf, sizeof(gchar),
B64_LINE_SIZE, attach_fp))
fputs(outbuf, fp);
fputc('\n', fp);
}
- break;
- default:
- debug_print("Tried to write attachment in unsupported encoding type\n");
- break;
+ } else if (ainfo->encoding == ENC_QUOTED_PRINTABLE) {
+ gchar inbuf[BUFFSIZE], outbuf[BUFFSIZE * 4];
+
+ while (fgets(inbuf, sizeof(inbuf), attach_fp) != NULL) {
+ qp_encode_line(outbuf, inbuf);
+ fputs(outbuf, fp);
+ }
+ } else {
+ gchar buf[BUFFSIZE];
+
+ while (fgets(buf, sizeof(buf), attach_fp) != NULL) {
+ strcrchomp(buf);
+ fputs(buf, fp);
+ }
}
fclose(attach_fp);
/* Program version and system info */
/* uname(&utsbuf); */
- if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer")) {
+ if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
+ !compose->newsgroup_list) {
fprintf(fp, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
compose->targetinfo = NULL;
compose->replyinfo = NULL;
+ compose->fwdinfo = NULL;
compose->replyto = NULL;
compose->cc = NULL;
if (replace)
gtk_stext_clear(GTK_STEXT(compose->text));
- if (compose->replyinfo == NULL) {
+ if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
NULL, NULL);
} else {
else
qmark = "> ";
- parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark, NULL);
+ if (compose->replyinfo != NULL)
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark, NULL);
+ else if (compose->fwdinfo != NULL)
+ parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
+ tmpl->value, qmark, NULL);
+ else
+ parsed_str = NULL;
}
- if (replace && parsed_str && prefs_common.auto_sig)
+ if (replace && parsed_str && compose->account->auto_sig)
compose_insert_sig(compose);
if (replace && parsed_str) {
procmsg_msginfo_free(compose->targetinfo);
procmsg_msginfo_free(compose->replyinfo);
+ procmsg_msginfo_free(compose->fwdinfo);
g_free(compose->replyto);
g_free(compose->cc);
optmenu = GTK_OPTION_MENU(attach_prop.encoding_optmenu);
if (ainfo->encoding == ENC_UNKNOWN)
- menu_select_by_data(gtk_option_menu_get_menu(optmenu),
+ menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
GINT_TO_POINTER(ENC_BASE64));
else
- menu_select_by_data(gtk_option_menu_get_menu(optmenu),
+ menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
GINT_TO_POINTER(ainfo->encoding));
gtk_entry_set_text(GTK_ENTRY(attach_prop.mimetype_entry),
#if 0
gtk_widget_set_sensitive(menuitem, FALSE);
#endif
- MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable", ENC_QUOTED_PRINTABLE);
- gtk_widget_set_sensitive(menuitem, FALSE);
+ MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable",
+ ENC_QUOTED_PRINTABLE);
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+
MENUITEM_ADD(optmenu_menu, menuitem, "base64", ENC_BASE64);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
lock = FALSE;
- /* 0: quit editing 1: keep editing */
+ /* 0: quit editing 1: keep editing 2: keep editing (autosave) */
if (action == 0)
gtk_widget_destroy(compose->window);
else {
compose->targetinfo->mtime = s.st_mtime;
compose->targetinfo->folder = draft;
compose->mode = COMPOSE_REEDIT;
+
+ if (action == 2) {
+ compose->autosaved_draft = compose->targetinfo;
+ }
}
}
if (prefs_common.autosave &&
gtk_stext_get_length(GTK_STEXT(widget)) % prefs_common.autosave_length == 0)
- compose_draft_cb((gpointer)compose, 1, NULL);
+ compose_draft_cb((gpointer)compose, 2, NULL);
}
static gboolean compose_send_control_enter(Compose *compose)