/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* 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
#include "statusbar.h"
#include "about.h"
#include "base64.h"
+#include "quoted-printable.h"
#include "codeconv.h"
#include "utils.h"
#include "gtkutils.h"
PRIORITY_LOWEST
} PriorityLevel;
-#if USE_GPGME
-typedef enum
-{
- GNUPG_MODE_DETACH,
- GNUPG_MODE_INLINE
-} ComposeGnuPGMode;
-#endif
-
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
static Compose *compose_create (PrefsAccount *account,
ComposeMode mode);
-static void compose_toolbar_create (Compose *compose,
- GtkWidget *container);
-static void compose_toolbar_update (Compose *compose);
-static void compose_toolbar_set_sensitive (Compose *compose,
- gboolean sensitive);
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
static gboolean compose_edit_size_alloc (GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler);
-
-static void toolbar_send_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_send_later_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_draft_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_insert_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_attach_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_sig_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_ext_editor_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_linewrap_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_address_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_actions_execute_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_compose_buttons_cb (GtkWidget *widget,
-
- ToolbarItem *t_item);
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
-
static void attach_selected (GtkCList *clist,
gint row,
gint column,
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
{N_("/_Remove"), NULL, compose_attach_remove_selected, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Property..."), NULL, compose_attach_property, 0, NULL}
+ {N_("/_Properties..."), NULL, compose_attach_property, 0, NULL}
};
static GtkItemFactoryEntry compose_entries[] =
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose->replyinfo = NULL;
+ compose->fwdinfo = NULL;
text = GTK_STEXT(compose->text);
gtk_stext_freeze(text);
const gchar *body)
{
Compose *compose;
- PrefsAccount *account;
+ PrefsAccount *account = NULL;
PrefsAccount *reply_account;
GtkSText *text;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- account = NULL;
- /* select the account set in folderitem's property (if enabled) */
- if (msginfo->folder->prefs && msginfo->folder->prefs->enable_default_account)
- account = account_find_from_id(msginfo->folder->prefs->default_account);
+ account = account_get_reply_account(msginfo, prefs_common.reply_account_autosel);
- /* select the account for the whole folder (IMAP / NNTP) */
- if (!account)
- /* FIXME: this is not right, because folder may be nested. we should
- * ascend the tree until we find a parent with proper account
- * information */
- account = msginfo->folder->folder->account;
-
- /* select account by to: and cc: header if enabled */
- if (prefs_common.reply_account_autosel) {
- if (!account && msginfo->to) {
- gchar *to;
- Xstrdup_a(to, msginfo->to, return);
- extract_address(to);
- account = account_find_from_address(to);
- }
- if (!account) {
- gchar cc[BUFFSIZE];
- if (!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
- extract_address(cc);
- account = account_find_from_address(cc);
- }
- }
- }
-
- /* select current account */
- if (!account) account = cur_account;
g_return_if_fail(account != NULL);
if (ignore_replyto && account->protocol == A_NNTP &&
compose_exec_ext_editor(compose);
}
-static void set_toolbar_style(Compose *compose);
-
#define INSERT_FW_HEADER(var, hdr) \
if (msginfo->var && *msginfo->var) { \
gtk_stext_insert(text, NULL, NULL, NULL, hdr, -1); \
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
+ if (msginfo->folder->prefs->enable_default_account)
+ account = account_find_from_id(msginfo->folder->prefs->default_account);
if (!account)
account = msginfo->folder->folder->account;
if (!account && msginfo->to && prefs_common.forward_account_autosel) {
}
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),
msgfile = procmsg_get_message_file_path(msginfo);
if (!is_file_exist(msgfile))
- g_warning(_("%s: file not exist\n"), msgfile);
+ g_warning("%s: file not exist\n", msgfile);
else
compose_attach_append(compose, msgfile, msgfile,
"message/rfc822");
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+
+ /*save folder*/
+ if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
+ gchar *folderidentifier;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+ folderidentifier = folder_item_get_identifier(msginfo->folder);
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
return compose;
}
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
if (!is_file_exist(msgfile))
- g_warning(_("%s: file not exist\n"), msgfile);
+ g_warning("%s: file not exist\n", msgfile);
else
compose_attach_append(compose, msgfile, msgfile,
"message/rfc822");
/* Select Account from queue headers */
if (!get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Account-Id:")) {
+ id = atoi(&queueheader_buf[22]);
+ account = account_find_from_id(id);
+ }
+ if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "NAID:")) {
id = atoi(&queueheader_buf[5]);
account = account_find_from_id(id);
gtk_stext_freeze(text);
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
- g_warning(_("Can't get text part\n"));
+ g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose->replyinfo = NULL;
+ compose->fwdinfo = NULL;
compose_show_first_last_header(compose, TRUE);
return NULL;
compose->redirect_filename = filename;
+
+ compose_attach_parts(compose, msginfo);
if (msginfo->subject)
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
menu_set_sensitive(ifactory, "/File/Insert file", FALSE);
menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Paste", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Edit with external editor", FALSE);
- menu_set_sensitive(ifactory, "/Message/Attach", FALSE);
+ menu_set_sensitive(ifactory, "/Edit", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Save to draft folder", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Save and keep editing", FALSE);
#if USE_GPGME
menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
menu_set_sensitive(ifactory, "/Message/Mode/MIME", FALSE);
menu_set_sensitive(ifactory, "/Message/Mode/Inline", FALSE);
#endif
+ menu_set_sensitive(ifactory, "/Message/Priority", FALSE);
menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
- menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
+ menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
+ menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
}
}
+void compose_toolbar_cb(gint action, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ Compose *compose = (Compose*)toolbar_item->parent;
+
+ g_return_if_fail(compose != NULL);
+
+ switch(action) {
+ case A_SEND:
+ compose_send_cb(compose, 0, NULL);
+ break;
+ case A_SENDL:
+ compose_send_later_cb(compose, 0, NULL);
+ break;
+ case A_DRAFT:
+ compose_draft_cb(compose, 0, NULL);
+ break;
+ case A_INSERT:
+ compose_insert_file_cb(compose, 0, NULL);
+ break;
+ case A_ATTACH:
+ compose_attach_cb(compose, 0, NULL);
+ break;
+ case A_SIG:
+ compose_insert_sig(compose);
+ break;
+ case A_EXTEDITOR:
+ compose_ext_editor_cb(compose, 0, NULL);
+ break;
+ case A_LINEWRAP:
+ compose_wrap_line(compose);
+ break;
+ case A_ADDRBOOK:
+ compose_address_cb(compose, 0, NULL);
+ break;
+ default:
+ break;
+ }
+}
+
static void compose_entries_set(Compose *compose, const gchar *mailto)
{
gchar *to = NULL;
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;
}
g_return_if_fail(msginfo != NULL);
if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
- if (!compose->replyto && to_ml && compose->ml_post)
+ 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);
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
#endif
compose_show_first_last_header(compose, TRUE);
-#if 0 /* NEW COMPOSE GUI */
- if (compose->bcc) {
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- }
- if (compose->replyto) {
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Reply to");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- }
-#endif
}
#undef SET_ENTRY
gint row;
if (!is_file_exist(file)) {
- g_warning(_("File %s doesn't exist\n"), file);
+ g_warning("File %s doesn't exist\n", file);
return;
}
if ((size = get_file_size(file)) < 0) {
- g_warning(_("Can't get file size of %s\n"), file);
+ g_warning("Can't get file size of %s\n", file);
return;
}
if (size == 0) {
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));
}
outfile = procmime_get_tmp_file_name(child);
if (procmime_get_part(outfile, infile, child) < 0)
- g_warning(_("Can't get the part of multipart message."));
+ g_warning("Can't get the part of multipart message.");
else if (compose->mode != COMPOSE_REEDIT || strcmp(child->content_type, "application/pgp-signature"))
compose_attach_append
(compose, outfile,
/* skip delete if it is continuous URL */
if (do_delete && (line_pos - p_pos <= i_len) &&
- gtkut_stext_is_uri_string(text, line_pos, tlen))
+ gtk_stext_is_uri_string(text, line_pos, tlen))
do_delete = FALSE;
#ifdef WRAP_DEBUG
indent string, delete them */
if (i_len) {
guint ilen;
- ilen = gtkut_stext_str_compare_n
+ ilen = gtk_stext_str_compare_n
(text, cur_pos, p_pos, i_len,
tlen);
if (ilen) {
#endif
/* force wrapping if it is one long word but not URL */
if (line_pos - p_pos <= i_len)
- if (!gtkut_stext_is_uri_string
+ if (!gtk_stext_is_uri_string
(text, line_pos, tlen))
line_pos = cur_pos - 1;
#ifdef WRAP_DEBUG
/* if next character is space delete it */
if (clen == 1 && isspace(*cbuf)) {
if (p_pos + i_len != line_pos ||
- !gtkut_stext_is_uri_string
+ !gtk_stext_is_uri_string
(text, line_pos, tlen)) {
STEXT_FREEZE();
/* workaround for correct cursor
/* if it is URL at beginning of line don't wrap */
if (p_pos + i_len == line_pos &&
- gtkut_stext_is_uri_string(text, line_pos, tlen)) {
+ gtk_stext_is_uri_string(text, line_pos, tlen)) {
#ifdef WRAP_DEBUG
g_print("found URL at ");
dump_text(text, line_pos, tlen, 1);
/* should we insert quotation ? */
if (linewrap_quote && i_len) {
/* only if line is not already quoted */
- if (!gtkut_stext_str_compare
+ if (!gtk_stext_str_compare
(text, line_pos, tlen, qfmt)) {
guint ins_len;
gtk_widget_set_sensitive(menuitem, FALSE);
}
- if (account->set_autocc && account->auto_cc &&
- compose->mode != COMPOSE_REEDIT) {
- gtk_entry_set_text
- (GTK_ENTRY(compose->cc_entry), account->auto_cc);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ if (account->set_autocc) {
+ compose_entry_show(compose, COMPOSE_ENTRY_CC);
+ if (account->auto_cc && compose->mode != COMPOSE_REEDIT)
+ compose_entry_set(compose, account->auto_cc,
+ COMPOSE_ENTRY_CC);
}
if (account->set_autobcc) {
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ compose_entry_show(compose, COMPOSE_ENTRY_BCC);
if (account->auto_bcc && compose->mode != COMPOSE_REEDIT)
- gtk_entry_set_text(GTK_ENTRY(compose->bcc_entry),
- account->auto_bcc);
+ compose_entry_set(compose, account->auto_bcc,
+ COMPOSE_ENTRY_BCC);
}
if (account->set_autoreplyto) {
- menuitem = gtk_item_factory_get_item(ifactory,
- "/View/Reply to");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ compose_entry_show(compose, COMPOSE_ENTRY_REPLY_TO);
if (account->auto_replyto && compose->mode != COMPOSE_REEDIT)
- gtk_entry_set_text(GTK_ENTRY(compose->reply_entry),
- account->auto_replyto);
+ compose_entry_set(compose, account->auto_replyto,
+ COMPOSE_ENTRY_REPLY_TO);
}
menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
alertpanel_error(_("Could not queue message for sending"));
return -1;
}
+
+ if (msgnum == 0) {
+ alertpanel_error(_("The message was queue but could not be send.\nUse \"Send queued messages\" from the main window to send it"));
+ return 0;
+ }
msgpath = folder_item_fetch_msg(folder, msgnum);
val = procmsg_send_message_queue(msgpath);
g_free(msgpath);
folder_item_remove_msg(folder, msgnum);
- folderview_update_item(folder, TRUE);
return val;
}
}
if (!compose->to_list && !compose->newsgroup_list) {
- g_warning(_("can't get recipient list."));
+ g_warning("can't get recipient list.");
unlink(tmp);
lock = FALSE;
return -1;
ac = compose->account;
ok = send_message(tmp, ac, compose->to_list);
- statusbar_pop_all();
}
if (ok == 0 && compose->newsgroup_list) {
alertpanel_error(_("Can't queue the message."));
}
} else
- alertpanel_error(_("Error occurred while sending the message."));
+ alertpanel_error_log(_("Error occurred while sending the message."));
} else {
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
- if (compose->targetinfo)
- folderview_update_item
- (compose->targetinfo->folder, TRUE);
}
/* save message to outbox */
if (prefs_common.savemsg) {
if (procmsg_save_to_outbox(outbox, tmp, FALSE) < 0)
alertpanel_error
(_("Can't save the message to Sent."));
- else
- folderview_update_item(outbox, TRUE);
}
}
/* chmod for security */
if (change_file_mode_rw(fdest, file) < 0) {
FILE_OP_ERROR(file, "chmod");
- g_warning(_("can't change file mode\n"));
+ g_warning("can't change file mode\n");
}
while (procheader_get_unfolded_line(buf, sizeof(buf), fp)) {
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;
/* chmod for security */
if (change_file_mode_rw(fp, file) < 0) {
FILE_OP_ERROR(file, "chmod");
- g_warning(_("can't change file mode\n"));
+ g_warning("can't change file mode\n");
}
/* get all composed text */
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 &&
}
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) {
/* write headers */
if (compose_write_headers
(compose, fp, out_codeset, encoding, is_draft) < 0) {
- g_warning(_("can't write headers\n"));
+ g_warning("can't write headers\n");
fclose(fp);
/* unlink(file); */
g_free(buf);
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;
}
/* chmod for security */
if (change_file_mode_rw(fp, file) < 0) {
FILE_OP_ERROR(file, "chmod");
- g_warning(_("can't change file mode\n"));
+ g_warning("can't change file mode\n");
}
chars = gtk_editable_get_chars(GTK_EDITABLE(compose->text), 0, -1);
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"));
+ g_warning("can't remove the old message\n");
return -1;
}
}
if (procmsg_msg_exist(msginfo)) {
folder_item_remove_msg(drafts, msginfo->msgnum);
- folderview_update_item(drafts, TRUE);
}
}
}
if (!compose->to_list && !compose->newsgroup_list) {
- g_warning(_("can't get recipient list."));
+ g_warning("can't get recipient list.");
lock = FALSE;
return -1;
}
}
if (change_file_mode_rw(fp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
- g_warning(_("can't change file mode\n"));
+ g_warning("can't change file mode\n");
}
/* queueing variables */
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) {
queue = account_get_special_folder(compose->account, F_QUEUE);
if (!queue) {
- g_warning(_("can't find queue folder\n"));
+ g_warning("can't find queue folder\n");
unlink(tmp);
g_free(tmp);
return -1;
}
folder_item_scan(queue);
if ((num = folder_item_add_msg(queue, tmp, TRUE)) < 0) {
- g_warning(_("can't queue the message\n"));
+ g_warning("can't queue the message\n");
unlink(tmp);
g_free(tmp);
return -1;
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
- if (compose->targetinfo &&
- compose->targetinfo->folder != queue)
- folderview_update_item
- (compose->targetinfo->folder, TRUE);
}
- folderview_update_item(queue, TRUE);
-
if ((msgnum != NULL) && (item != NULL)) {
*msgnum = num;
*item = queue;
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);
+ g_warning("Can't open file %s\n", ainfo->file);
continue;
}
fprintf(fp, "Content-Type: %s\n", ainfo->content_type);
fprintf(fp, "Content-Disposition: inline\n");
} else {
- conv_encode_header(filename, sizeof(filename),
- ainfo->name, 12);
+ compose_convert_header(filename, sizeof(filename),
+ ainfo->name, 12);
fprintf(fp, "Content-Type: %s;\n"
" name=\"%s\"\n",
ainfo->content_type, filename);
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);
/* Save draft infos */
if (is_draft) {
+ fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
fprintf(fp, "S:%s\n", compose->account->address);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
if (len < 1) return;
- remove_return(src);
+ g_strchomp(src);
- if (is_ascii_str(src)) {
- strncpy2(dest, src, len);
- dest[len - 1] = '\0';
- return;
- } else
- conv_encode_header(dest, len, src, header_len);
+ conv_encode_header(dest, len, src, header_len);
}
static void compose_generate_msgid(Compose *compose, gchar *buf, gint len)
GtkWidget *combo;
GtkWidget *entry;
GList *combo_list = NULL;
- gchar **string, *header;
+ gchar **string, *header = NULL;
ComposeHeaderEntry *headerentry;
gboolean standard_header = FALSE;
combo = gtk_combo_new();
string = headers;
while(*string != NULL) {
- combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
- string++;
+ combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
+ string++;
}
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_list_free(combo_list);
break;
}
}
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
+ if (header)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
/* Entry field */
entry = gtk_entry_new();
handlebox = gtk_handle_box_new();
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
- compose_toolbar_create(compose, handlebox);
+ compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
+ (gpointer)compose);
vbox2 = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
compose->targetinfo = NULL;
compose->replyinfo = NULL;
+ compose->fwdinfo = NULL;
compose->replyto = NULL;
compose->cc = NULL;
compose->redirect_filename = NULL;
compose->undostruct = undostruct;
#if USE_ASPELL
-
menu_set_sensitive(ifactory, "/Spelling", FALSE);
- if (prefs_common.enable_aspell &&
- strcmp(prefs_common.dictionary, _("None"))) {
- gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
- conv_get_current_charset_str(),
- prefs_common.misspelled_col,
- prefs_common.check_while_typing,
- prefs_common.use_alternate,
- GTK_STEXT(text));
- if (!gtkaspell) {
- alertpanel_error(_("Spell checker could not be started.\n%s"), gtkaspellcheckers->error_message);
- gtkaspell_checkers_reset_error();
- } else {
+ if (mode != COMPOSE_REDIRECT) {
+ if (prefs_common.enable_aspell && prefs_common.dictionary &&
+ strcmp(prefs_common.dictionary, _("None"))) {
+ gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
+ conv_get_current_charset_str(),
+ prefs_common.misspelled_col,
+ prefs_common.check_while_typing,
+ prefs_common.use_alternate,
+ GTK_STEXT(text));
+ if (!gtkaspell) {
+ alertpanel_error(_("Spell checker could not be started.\n%s"), gtkaspellcheckers->error_message);
+ gtkaspell_checkers_reset_error();
+ } else {
- GtkWidget *menuitem;
+ GtkWidget *menuitem;
- if (!gtkaspell_set_sug_mode(gtkaspell, prefs_common.aspell_sugmode)) {
- debug_print("Aspell: could not set suggestion mode %s\n",
- gtkaspellcheckers->error_message);
- gtkaspell_checkers_reset_error();
- }
+ if (!gtkaspell_set_sug_mode(gtkaspell, prefs_common.aspell_sugmode)) {
+ debug_print("Aspell: could not set suggestion mode %s\n",
+ gtkaspellcheckers->error_message);
+ gtkaspell_checkers_reset_error();
+ }
- menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
- gtkaspell_populate_submenu(gtkaspell, menuitem);
- menu_set_sensitive(ifactory, "/Spelling", TRUE);
- }
- }
+ menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
+ gtkaspell_populate_submenu(gtkaspell, menuitem);
+ menu_set_sensitive(ifactory, "/Spelling", TRUE);
+ }
+ }
+ }
#endif
compose_select_account(compose, account);
addressbook_set_target_compose(compose);
update_compose_actions_menu(ifactory, "/Tools/Actions", compose);
- compose_set_template_menu(compose);
+
+ if (mode != COMPOSE_REDIRECT)
+ compose_set_template_menu(compose);
+ else {
+ GtkWidget *menuitem;
+ menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Template");
+ menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
+ }
compose_list = g_list_append(compose_list, compose);
#if USE_GPGME
activate_gnupg_mode(compose, account);
#endif
-
- set_toolbar_style(compose);
-
+ toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
gtk_widget_show(window);
return compose;
}
-static void toolbar_compose_buttons_cb(GtkWidget *widget,
- ToolbarItem *t_item)
-{
- struct {
- gint index;
- void (*func)(GtkWidget *widget, gpointer data);
- } compose_action[] = {
- { A_SEND, toolbar_send_cb },
- { A_SENDL, toolbar_send_later_cb },
- { A_DRAFT, toolbar_draft_cb },
- { A_INSERT, toolbar_insert_cb },
- { A_ATTACH, toolbar_attach_cb },
- { A_SIG, toolbar_sig_cb },
- { A_EXTEDITOR, toolbar_ext_editor_cb },
- { A_LINEWRAP, toolbar_linewrap_cb },
- { A_ADDRBOOK, toolbar_address_cb },
- { A_SYL_ACTIONS, toolbar_actions_execute_cb }};
-
-
- gint num_items = sizeof(compose_action)/sizeof(compose_action[0]);
- gint i;
- debug_print("_buttons: index: %i \n", t_item->index);
- for (i = 0; i < num_items; i++) {
-
- if (compose_action[i].index == t_item->index) {
- Compose *compose = (Compose*)t_item->parent;
- debug_print("_buttons: compose: %p toolbar: %p\n", compose, compose->toolbar); compose_action[i].func(widget, compose);
- break;
- }
- }
-}
-
-static void compose_toolbar_update(Compose *compose)
-{
- gtk_container_remove(GTK_CONTAINER(compose->handlebox),
- GTK_WIDGET(compose->toolbar->toolbar));
-
- compose->toolbar->toolbar = NULL;
- compose->toolbar->send_btn = NULL;
- compose->toolbar->sendl_btn = NULL;
- compose->toolbar->draft_btn = NULL;
- compose->toolbar->insert_btn = NULL;
- compose->toolbar->attach_btn = NULL;
- compose->toolbar->sig_btn = NULL;
- compose->toolbar->exteditor_btn = NULL;
- compose->toolbar->linewrap_btn = NULL;
- compose->toolbar->addrbook_btn = NULL;
-
- TOOLBAR_DESTROY_ITEMS(compose->toolbar->t_item_list);
- TOOLBAR_DESTROY_ACTIONS(compose->toolbar->t_action_list);
- compose_toolbar_create(compose, compose->handlebox);
-}
-
-static void compose_toolbar_create(Compose *compose,
- GtkWidget *container)
-{
- ToolbarItem *toolbar_item;
-
- GtkWidget *toolbar;
- GtkWidget *icon_wid = NULL;
- GtkWidget *item;
- GtkTooltips *toolbar_tips;
- ToolbarSylpheedActions *t_action_item;
- GSList *cur;
- GSList *toolbar_list;
- GList *elem;
- toolbar_tips = gtk_tooltips_new();
-
- toolbar_read_config_file(TOOLBAR_COMPOSE);
- toolbar_list = toolbar_get_list(TOOLBAR_COMPOSE);
-
- compose->toolbar = g_new0(ComposeToolbar, 1);
-
- for (elem = compose_list; elem != NULL; elem = elem->next) {
- Compose *c = (Compose*)elem->data;
- debug_print("toolbar_create: compose: %p toolbar: %p\n",
- c, c->toolbar);
- }
-
- toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
- GTK_TOOLBAR_BOTH);
- gtk_container_add(GTK_CONTAINER(container), toolbar);
- gtk_container_set_border_width(GTK_CONTAINER(container), 2);
- gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
- gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_SPACE_LINE);
-
- for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-
- if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- continue;
- }
-
- toolbar_item = g_new0(ToolbarItem, 1);
- toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
- toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
- toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-
- toolbar_item->parent = (gpointer)compose;
-
- /* collect toolbar items in list to keep track */
- compose->toolbar->t_item_list = g_slist_append(compose->toolbar->t_item_list,
- toolbar_item);
-
- icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
- item = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- toolbar_item->text,
- (""),
- (""),
- icon_wid, toolbar_compose_buttons_cb,
- toolbar_item);
-
- switch (toolbar_item->index) {
- case A_SEND:
- compose->toolbar->send_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->send_btn,
- _("Send Message"), NULL);
- break;
- case A_SENDL:
- compose->toolbar->sendl_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->sendl_btn,
- _("Put into queue folder and send later"), NULL);
- break;
- case A_DRAFT:
- compose->toolbar->draft_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->draft_btn,
- _("Save to draft folder"), NULL);
- break;
- case A_INSERT:
- compose->toolbar->insert_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->insert_btn,
- _("Insert file"), NULL);
- break;
- case A_ATTACH:
- compose->toolbar->attach_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->attach_btn,
- _("Attach file"), NULL);
- break;
- case A_SIG:
- compose->toolbar->sig_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->sig_btn,
- _("Insert signature"), NULL);
- break;
- case A_EXTEDITOR:
- compose->toolbar->exteditor_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->exteditor_btn,
- _("Edit with external editor"), NULL);
- break;
- case A_LINEWRAP:
- compose->toolbar->linewrap_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->linewrap_btn,
- _("Wrap all long lines"), NULL);
- break;
- case A_ADDRBOOK:
- compose->toolbar->addrbook_btn = item;
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- compose->toolbar->addrbook_btn,
- _("Address book"), NULL);
- break;
- case A_SYL_ACTIONS:
- t_action_item = g_new0(ToolbarSylpheedActions, 1);
- t_action_item->widget = item;
- t_action_item->name = g_strdup(toolbar_item->text);
-
- compose->toolbar->t_action_list =
- g_slist_append(compose->toolbar->t_action_list,
- t_action_item);
-
- gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
- item,
- t_action_item->name, NULL);
-
- gtk_widget_show(item);
- break;
- default:
- break;
- }
- }
-
- compose->toolbar->toolbar = toolbar;
-
- gtk_widget_show_all(toolbar);
-}
-
-static void compose_toolbar_set_sensitive (Compose * compose, gboolean sensitive)
-{
- GSList *items = compose->toolbar->t_action_list;
- if (compose->toolbar->send_btn)
- gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
- if (compose->toolbar->sendl_btn)
- gtk_widget_set_sensitive(compose->toolbar->sendl_btn, sensitive);
- if (compose->toolbar->draft_btn )
- gtk_widget_set_sensitive(compose->toolbar->draft_btn , sensitive);
- if (compose->toolbar->insert_btn )
- gtk_widget_set_sensitive(compose->toolbar->insert_btn , sensitive);
- if (compose->toolbar->attach_btn)
- gtk_widget_set_sensitive(compose->toolbar->attach_btn, sensitive);
- if (compose->toolbar->sig_btn)
- gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
- if (compose->toolbar->exteditor_btn)
- gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
- if (compose->toolbar->linewrap_btn)
- gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, sensitive);
- if (compose->toolbar->addrbook_btn)
- gtk_widget_set_sensitive(compose->toolbar->addrbook_btn, sensitive);
- for (; items != NULL; items = g_slist_next(items)) {
- ToolbarSylpheedActions *item = (ToolbarSylpheedActions *)items->data;
- gtk_widget_set_sensitive(item->widget, sensitive);
- }
-}
-
static GtkWidget *compose_account_option_menu_create(Compose *compose)
{
GList *accounts;
else
name = g_strdup_printf("%s: %s",
ac->account_name, ac->address);
- MENUITEM_ADD(menu, menuitem, name, ac);
+ MENUITEM_ADD(menu, menuitem, name, ac->account_id);
g_free(name);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(account_activated),
for (cur = compose_list; cur != NULL; cur = cur->next) {
compose = (Compose *)cur->data;
- compose_toolbar_update(compose);
- set_toolbar_style(compose);
+ toolbar_update(TOOLBAR_COMPOSE, compose);
}
}
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)
procmsg_msginfo_free(compose->targetinfo);
procmsg_msginfo_free(compose->replyinfo);
+ procmsg_msginfo_free(compose->fwdinfo);
g_free(compose->replyto);
g_free(compose->cc);
gtk_widget_destroy(compose->paned);
- TOOLBAR_DESTROY_ITEMS(compose->toolbar->t_item_list);
- TOOLBAR_DESTROY_ACTIONS(compose->toolbar->t_action_list);
+ toolbar_destroy(compose->toolbar);
g_free(compose->toolbar);
g_free(compose);
optmenu = GTK_OPTION_MENU(attach_prop.encoding_optmenu);
if (ainfo->encoding == ENC_UNKNOWN)
- gtk_option_menu_set_history(optmenu, ENC_BASE64);
+ menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
+ GINT_TO_POINTER(ENC_BASE64));
else
- gtk_option_menu_set_history(optmenu, ainfo->encoding);
+ 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),
ainfo->content_type ? ainfo->content_type : "");
window = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_widget_set_usize(window, 480, -1);
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
- gtk_window_set_title(GTK_WINDOW(window), _("Property"));
+ gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
#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);
g_snprintf(buf, sizeof(buf), prefs_common.ext_editor_cmd, file);
} else {
if (prefs_common.ext_editor_cmd)
- g_warning(_("External editor command line is invalid: `%s'\n"),
+ g_warning("External editor command line is invalid: `%s'\n",
prefs_common.ext_editor_cmd);
g_snprintf(buf, sizeof(buf), def_cmd, file);
}
if (kill(pgid, SIGTERM) < 0) perror("kill");
waitpid(compose->exteditor_pid, NULL, 0);
- g_warning(_("Terminated process group id: %d"), -pgid);
- g_warning(_("Temporary file: %s"),
+ g_warning("Terminated process group id: %d", -pgid);
+ g_warning("Temporary file: %s",
compose->exteditor_file);
compose_set_ext_editor_sensitive(compose, TRUE);
if (unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
} else if (buf[0] == '1') { /* failed */
- g_warning(_("Couldn't exec external editor\n"));
+ g_warning("Couldn't exec external editor\n");
if (unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
} else if (buf[0] == '2') {
- g_warning(_("Couldn't write to file\n"));
+ g_warning("Couldn't write to file\n");
} else if (buf[0] == '3') {
- g_warning(_("Pipe read failed\n"));
+ g_warning("Pipe read failed\n");
}
close(source);
return TRUE;
}
-static void toolbar_send_cb(GtkWidget *widget, gpointer data)
-{
- compose_send_cb(data, 0, NULL);
-}
-
-static void toolbar_send_later_cb(GtkWidget *widget, gpointer data)
-{
- compose_send_later_cb(data, 0, NULL);
-}
-
-static void toolbar_draft_cb(GtkWidget *widget, gpointer data)
-{
- compose_draft_cb(data, 0, NULL);
-}
-
-static void toolbar_insert_cb(GtkWidget *widget, gpointer data)
-{
- compose_insert_file_cb(data, 0, NULL);
-}
-
-static void toolbar_attach_cb(GtkWidget *widget, gpointer data)
-{
- compose_attach_cb(data, 0, NULL);
-}
-
-static void toolbar_sig_cb(GtkWidget *widget, gpointer data)
-{
- Compose *compose = (Compose *)data;
-
- compose_insert_sig(compose);
-}
-
-static void toolbar_ext_editor_cb(GtkWidget *widget, gpointer data)
-{
- Compose *compose = (Compose *)data;
-
- compose_exec_ext_editor(compose);
-}
-
-static void toolbar_linewrap_cb(GtkWidget *widget, gpointer data)
-{
- Compose *compose = (Compose *)data;
-
- compose_wrap_line(compose);
-}
-
-static void toolbar_address_cb(GtkWidget *widget, gpointer data)
-{
- compose_address_cb(data, 0, NULL);
-}
-
-static void toolbar_actions_execute_cb(GtkWidget *widget,
- gpointer data)
-{
- Compose *compose = (Compose*)data;
-
- toolbar_action_execute(widget, compose->toolbar->t_action_list, data, TOOLBAR_COMPOSE);
-}
-
static void account_activated(GtkMenuItem *menuitem, gpointer data)
{
Compose *compose = (Compose *)data;
PrefsAccount *ac;
- ac = (PrefsAccount *)gtk_object_get_user_data(GTK_OBJECT(menuitem));
+ ac = account_find_from_id(
+ GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem))));
g_return_if_fail(ac != NULL);
if (ac != compose->account)
static void compose_allow_user_actions (Compose *compose, gboolean allow)
{
GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
- compose_toolbar_set_sensitive(compose, allow);
+ toolbar_comp_set_sensitive(compose, allow);
menu_set_sensitive(ifactory, "/File", allow);
menu_set_sensitive(ifactory, "/Edit", allow);
+ menu_set_sensitive(ifactory, "/Spelling", allow);
menu_set_sensitive(ifactory, "/Message", allow);
menu_set_sensitive(ifactory, "/Tools", allow);
menu_set_sensitive(ifactory, "/Help", allow);
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
- if (compose->targetinfo &&
- compose->targetinfo->folder != draft)
- folderview_update_item(compose->targetinfo->folder,
- TRUE);
}
- newmsginfo = folder_item_fetch_msginfo(draft, msgnum);
- procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
- MSG_SET_TMP_FLAGS(newmsginfo->flags, MSG_DRAFT);
- folderview_update_item(draft, TRUE);
- procmsg_msginfo_free(newmsginfo);
+ newmsginfo = folder_item_get_msginfo(draft, msgnum);
+ if (newmsginfo) {
+ procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
+ procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+ procmsg_msginfo_free(newmsginfo);
+ }
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;
+ }
}
}
static void activate_gnupg_mode (Compose *compose, PrefsAccount *account)
{
- if (account->clearsign || account->ascii_armored)
+ if (account->default_gnupg_mode)
compose->gnupg_mode = GNUPG_MODE_INLINE;
else
compose->gnupg_mode = GNUPG_MODE_DETACH;
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)
ifactory = gtk_item_factory_from_widget(compose->menubar);
send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu));
+ if (!list)
+ return FALSE;
+
accel = (GtkAccelEntry *)list->data;
- if (accel->accelerator_key == kev->keyval &&
+ if (accel && accel->accelerator_key == kev->keyval &&
(accel->accelerator_mods & ~ignored_mods) ==
(kev->state & ~ignored_mods)) {
compose_send_cb(compose, 0, NULL);
}
#endif
-static void set_toolbar_style(Compose *compose)
-{
- switch (prefs_common.toolbar_style) {
- case TOOLBAR_NONE:
- gtk_widget_hide(compose->handlebox);
- break;
- case TOOLBAR_ICON:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
- GTK_TOOLBAR_ICONS);
- break;
- case TOOLBAR_TEXT:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
- GTK_TOOLBAR_TEXT);
- break;
- case TOOLBAR_BOTH:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
- GTK_TOOLBAR_BOTH);
- break;
- }
-
- if (prefs_common.toolbar_style != TOOLBAR_NONE) {
- gtk_widget_show(compose->handlebox);
- gtk_widget_queue_resize(compose->handlebox);
- }
-}
projects / claws.git / blobdiff