gboolean check_subject);
static gint compose_write_to_file (Compose *compose,
FILE *fp,
- gint action);
+ gint action,
+ gboolean attach_parts);
static gint compose_write_body_to_file (Compose *compose,
const gchar *file);
static gint compose_remove_reedit_target (Compose *compose,
gboolean force);
void compose_remove_draft (Compose *compose);
-static gint compose_queue (Compose *compose,
- gint *msgnum,
- FolderItem **item,
- gchar **msgpath);
static gint compose_queue_sub (Compose *compose,
gint *msgnum,
FolderItem **item,
gchar **msgpath,
- gboolean check_subject);
+ gboolean check_subject,
+ gboolean remove_reedit_target);
static void compose_add_attachments (Compose *compose,
MimeInfo *parent);
static gchar *compose_get_header (Compose *compose);
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
-static gboolean compose_close (Compose *compose);
-
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
NULL, compose_check_backwards , 0, NULL},
{N_("/_Spelling/_Forward to next misspelled word"),
NULL, compose_check_forwards_go, 0, NULL},
+ {N_("/_Spelling/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Spelling/Options"),
+ NULL, NULL, 0, "<Branch>"},
#endif
{N_("/_Options"), NULL, NULL, 0, "<Branch>"},
{N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
GtkStyle *style;
g_warning("Compose: color allocation failed.\n");
- style = gtk_widget_get_style(text);
+ style = gtk_widget_get_style(GTK_WIDGET(text));
quote_color1 = quote_color2 = quote_color3 =
quote_bgcolor1 = quote_bgcolor2 = quote_bgcolor3 =
signature_color = uri_color = black;
reply_account = account;
compose = compose_create(account, COMPOSE_REPLY, FALSE);
+
+ compose->updating = TRUE;
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_active(ifactory, "/Options/Remove references", FALSE);
menu_set_sensitive(ifactory, "/Options/Remove references", TRUE);
- compose->updating = TRUE;
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->replyinfo)
compose->replyinfo = procmsg_msginfo_copy(msginfo);
- compose->updating = FALSE;
-
- if (compose->deferred_destroy) {
- compose_destroy(compose);
- return NULL;
- }
compose_extract_original_charset(compose);
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
return compose;
}
compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->fwdinfo)
compose->fwdinfo = procmsg_msginfo_copy(msginfo);
- compose->updating = FALSE;
-
- if (compose->deferred_destroy) {
- compose_destroy(compose);
- return NULL;
- }
compose_extract_original_charset(compose);
gchar *qmark;
MsgInfo *full_msginfo;
- compose->updating = TRUE;
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
if (!full_msginfo)
full_msginfo = procmsg_msginfo_copy(msginfo);
- compose->updating = FALSE;
-
- if (compose->deferred_destroy) {
- compose_destroy(compose);
- return NULL;
- }
if (prefs_common.fw_quotemark &&
*prefs_common.fw_quotemark)
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
return compose;
}
compose = compose_create(account, COMPOSE_FORWARD, FALSE);
+ compose->updating = TRUE;
+
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
compose_create_tags(textview, compose);
undo_block(compose->undostruct);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
- compose->updating = TRUE;
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
- compose->updating = FALSE;
- if (compose->deferred_destroy) {
- compose_destroy(compose);
- g_free(msgfile);
- return NULL;
- }
+
if (!is_file_exist(msgfile))
g_warning("%s: file not exist\n", msgfile);
else
undo_unblock(compose->undostruct);
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
return compose;
}
}
}
-void compose_reedit(MsgInfo *msginfo)
+Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
{
Compose *compose = NULL;
PrefsAccount *account = NULL;
gboolean use_encryption = FALSE;
gchar *privacy_system = NULL;
- g_return_if_fail(msginfo != NULL);
- g_return_if_fail(msginfo->folder != NULL);
+ g_return_val_if_fail(msginfo != NULL, NULL);
+ g_return_val_if_fail(msginfo->folder != NULL, NULL);
if (compose_put_existing_to_front(msginfo)) {
- return;
+ return NULL;
}
if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
if (!account) {
account = cur_account;
}
- g_return_if_fail(account != NULL);
+ g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_REEDIT, FALSE);
+ compose = compose_create(account, COMPOSE_REEDIT, batch);
+
+ compose->updating = TRUE;
+
if (privacy_system != NULL) {
compose->privacy_system = privacy_system;
compose_use_signing(compose, use_signing);
activate_privacy_system(compose, account, FALSE);
}
- compose->updating = TRUE;
compose->targetinfo = procmsg_msginfo_copy(msginfo);
- compose->updating = FALSE;
-
- if (compose->deferred_destroy) {
- compose_destroy(compose);
- return;
- }
compose_extract_original_charset(compose);
}
if (compose_parse_header(compose, msginfo) < 0) {
- return;
+ compose->updating = FALSE;
+ compose_destroy(compose);
+ return NULL;
}
compose_reedit_set_entry(compose, msginfo);
}
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+ return compose;
}
Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, COMPOSE_REDIRECT, batch);
+
+ compose->updating = TRUE;
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose_create_tags(GTK_TEXT_VIEW(compose->text), compose);
compose->replyinfo = NULL;
gtk_widget_grab_focus(compose->header_last->entry);
- compose->updating = TRUE;
filename = procmsg_get_message_file_path(msginfo);
- compose->updating = FALSE;
- if (compose->deferred_destroy) {
+ if (filename == NULL) {
+ compose->updating = FALSE;
compose_destroy(compose);
- g_free(filename);
- return NULL;
- }
- if (filename == NULL)
return NULL;
+ }
compose->redirect_filename = filename;
compose->modified = FALSE;
compose_set_title(compose);
- return compose;
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
+ return compose;
}
GList *compose_get_compose_list(void)
tmp[cur-begin]='\0';
cur++;
begin = cur;
- while (*tmp == ' ')
+ while (*tmp == ' ' || *tmp == '\t')
tmp++;
compose_add_header_entry(compose, header, tmp);
g_free(o_tmp);
tmp[cur-begin]='\0';
cur++;
begin = cur;
- while (*tmp == ' ')
+ while (*tmp == ' ' || *tmp == '\t')
tmp++;
compose_add_header_entry(compose, header, tmp);
g_free(o_tmp);
g_return_if_fail(msginfo != NULL);
SET_ENTRY(subject_entry, msginfo->subject);
+ SET_ENTRY(from_name, msginfo->from);
SET_ADDRESS(COMPOSE_TO, msginfo->to);
SET_ADDRESS(COMPOSE_CC, compose->cc);
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
G_CALLBACK(text_inserted),
compose);
- cur_encoding = conv_get_locale_charset_str();
+ cur_encoding = conv_get_locale_charset_str_no_utf8();
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar *str;
return ac;
}
+#define QUOTE_IF_REQUIRED(out, str) \
+{ \
+ if (*str != '"' && strpbrk(str, ",.[]<>")) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ if ((__tmp = alloca(len)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ g_string_free(header, TRUE); \
+ return NULL; \
+ } \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ gchar *__tmp; \
+ \
+ if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ g_string_free(header, TRUE); \
+ return NULL; \
+ } else \
+ strcpy(__tmp, str); \
+ \
+ out = __tmp; \
+ } \
+}
+
+#define QUOTE_IF_REQUIRED_NORMAL(out, str, errret) \
+{ \
+ if (*str != '"' && strpbrk(str, ",.[]<>")) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ if ((__tmp = alloca(len)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ errret; \
+ } \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ gchar *__tmp; \
+ \
+ if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ errret; \
+ } else \
+ strcpy(__tmp, str); \
+ \
+ out = __tmp; \
+ } \
+}
+
static void compose_select_account(Compose *compose, PrefsAccount *account,
gboolean init)
{
GtkItemFactory *ifactory;
+ gchar *from = NULL;
g_return_if_fail(account != NULL);
compose->account = account;
+ if (account->name && *account->name) {
+ gchar *buf;
+ QUOTE_IF_REQUIRED_NORMAL(buf, account->name, return);
+ from = g_strdup_printf("%s <%s>",
+ buf, account->address);
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), from);
+ } else {
+ from = g_strdup_printf("<%s>",
+ account->address);
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), from);
+ }
+
+ g_free(from);
+
compose_set_title(compose);
ifactory = gtk_item_factory_from_widget(compose->menubar);
}
if (!found_other) {
AlertValue aval;
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
aval = alertpanel(_("Send"),
_("The only recipient is the default CC address. Send anyway?"),
GTK_STOCK_CANCEL, _("+_Send"), NULL);
}
if (!found_other) {
AlertValue aval;
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
aval = alertpanel(_("Send"),
_("The only recipient is the default BCC address. Send anyway?"),
GTK_STOCK_CANCEL, _("+_Send"), NULL);
const gchar *str;
if (compose_check_for_valid_recipient(compose) == FALSE) {
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
alertpanel_error(_("Recipient is not specified."));
return FALSE;
}
gint compose_send(Compose *compose)
{
gint msgnum;
- FolderItem *folder;
+ FolderItem *folder = NULL;
gint val = -1;
gchar *msgpath = NULL;
gboolean discard_window = FALSE;
-
+ gchar *errstr = NULL;
if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
|| compose->batch == TRUE)
discard_window = TRUE;
goto bail;
}
- val = compose_queue(compose, &msgnum, &folder, &msgpath);
+ val = compose_queue(compose, &msgnum, &folder, &msgpath, TRUE);
if (val) {
if (compose->batch) {
"Charset conversion failed."));
} else if (val == -3) {
alertpanel_error(_("Could not queue message for sending:\n\n"
- "Signature failed."));
+ "Signature failed: %s"), privacy_get_error());
} else if (val == -2 && errno != 0) {
alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
} else {
}
if (msgnum == 0) {
- if (!discard_window) {
- goto bail;
- }
alertpanel_error(_("The message was queued but could not be "
"sent.\nUse \"Send queued messages\" from "
"the main window to retry."));
+ if (!discard_window) {
+ goto bail;
+ }
return -1;
}
if (msgpath == NULL) {
msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath);
+ val = procmsg_send_message_queue(msgpath, &errstr);
g_free(msgpath);
} else {
- val = procmsg_send_message_queue(msgpath);
+ val = procmsg_send_message_queue(msgpath, &errstr);
g_unlink(msgpath);
g_free(msgpath);
}
if (!discard_window)
compose_close(compose);
} else {
+ if (errstr) {
+ gchar *tmp = g_strdup_printf(_("%s\nUse \"Send queued messages\" from "
+ "the main window to retry."), errstr);
+ g_free(errstr);
+ alertpanel_error_log(tmp);
+ g_free(tmp);
+ } else {
+ alertpanel_error_log(_("The message was queued but could not be "
+ "sent.\nUse \"Send queued messages\" from "
+ "the main window to retry."));
+ }
if (!discard_window) {
goto bail;
}
- alertpanel_error(_("The message was queued but could not be "
- "sent.\nUse \"Send queued messages\" from "
- "the main window to retry."));
return -1;
}
return -1;
}
-static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
+static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gboolean attach_parts)
{
GtkTextBuffer *buffer;
GtkTextIter start, end;
MimeInfo *mimemsg, *mimetext;
gint line;
+ if (action == COMPOSE_WRITE_FOR_SEND)
+ attach_parts = TRUE;
+
/* create message MimeInfo */
mimemsg = procmime_mimeinfo_new();
mimemsg->type = MIMETYPE_MESSAGE;
procmime_encode_content(mimetext, encoding);
/* append attachment parts */
- if (compose_use_attach(compose)) {
+ if (compose_use_attach(compose) && attach_parts) {
MimeInfo *mimempart;
gchar *boundary = NULL;
mimempart = procmime_mimeinfo_new();
}
-static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath)
+gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath,
+ gboolean remove_reedit_target)
{
- return compose_queue_sub (compose, msgnum, item, msgpath, FALSE);
+ return compose_queue_sub (compose, msgnum, item, msgpath, FALSE, remove_reedit_target);
}
-static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath, gboolean check_subject)
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
+ gchar **msgpath, gboolean check_subject,
+ gboolean remove_reedit_target)
{
FolderItem *queue;
gchar *tmp;
if (compose_check_entries(compose, check_subject) == FALSE) {
lock = FALSE;
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
return -1;
}
if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
+ lock = FALSE;
return -2;
}
if (newsac)
fprintf(fp, "NAID:%d\n", newsac->account_id);
+
if (compose->privacy_system != NULL) {
fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
if (compose->use_encryption) {
gchar *encdata;
-
- encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
+ if (mailac && mailac->encrypt_to_self) {
+ GSList *tmp_list = g_slist_copy(compose->to_list);
+ tmp_list = g_slist_append(tmp_list, compose->account->address);
+ encdata = privacy_get_encrypt_data(compose->privacy_system, tmp_list);
+ g_slist_free(tmp_list);
+ } else {
+ encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
+ }
if (encdata != NULL) {
if (strcmp(encdata, "_DONT_ENCRYPT_")) {
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
fprintf(fp, "FMID:%s\t%d\t%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
g_free(folderid);
}
- fprintf(fp, "\n");
+
+ /* end of headers */
+ fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
if (compose->redirect_filename != NULL) {
if (compose_redirect_write_to_file(compose, fp) < 0) {
}
} else {
gint result = 0;
- if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND)) < 0) {
+ if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND, TRUE)) < 0) {
lock = FALSE;
fclose(fp);
g_unlink(tmp);
FILE_OP_ERROR(tmp, "fclose");
g_unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return -2;
}
- queue = account_get_special_folder(compose->account, F_QUEUE);
+ if (item && *item) {
+ queue = *item;
+ } else {
+ queue = account_get_special_folder(compose->account, F_QUEUE);
+ }
if (!queue) {
g_warning("can't find queue folder\n");
g_unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return -1;
}
folder_item_scan(queue);
g_warning("can't queue the message\n");
g_unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return -1;
}
} else
*msgpath = tmp;
- if (compose->mode == COMPOSE_REEDIT) {
+ if (compose->mode == COMPOSE_REEDIT && remove_reedit_target) {
compose_remove_reedit_target(compose, FALSE);
}
} while (gtk_tree_model_iter_next(model, &iter));
}
-#define QUOTE_IF_REQUIRED(out, str) \
-{ \
- if (*str != '"' && strpbrk(str, ",.[]<>")) { \
- gchar *__tmp; \
- gint len; \
- \
- len = strlen(str) + 3; \
- if ((__tmp = alloca(len)) == NULL) { \
- g_warning("can't allocate memory\n"); \
- g_string_free(header, TRUE); \
- return NULL; \
- } \
- g_snprintf(__tmp, len, "\"%s\"", str); \
- out = __tmp; \
- } else { \
- gchar *__tmp; \
- \
- if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
- g_warning("can't allocate memory\n"); \
- g_string_free(header, TRUE); \
- return NULL; \
- } else \
- strcpy(__tmp, str); \
- \
- out = __tmp; \
- } \
-}
-
#define IS_IN_CUSTOM_HEADER(header) \
(compose->account->add_customhdr && \
custom_header_find(compose->account->customhdr_list, header) != NULL)
GSList *list;
gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GString *header;
+ gchar *from_name = NULL, *from_address = NULL;
+ gchar *tmp;
g_return_val_if_fail(compose->account != NULL, NULL);
g_return_val_if_fail(compose->account->address != NULL, NULL);
}
/* From */
+
if (compose->account->name && *compose->account->name) {
+ gchar *buf;
+ QUOTE_IF_REQUIRED(buf, compose->account->name);
+ tmp = g_strdup_printf("%s <%s>",
+ buf, compose->account->address);
+ } else {
+ tmp = g_strdup_printf("%s",
+ compose->account->address);
+ }
+ if (!strcmp(gtk_entry_get_text(GTK_ENTRY(compose->from_name)), tmp)
+ || strlen(gtk_entry_get_text(GTK_ENTRY(compose->from_name))) == 0) {
+ /* use default */
+ from_name = compose->account->name ? g_strdup(compose->account->name):NULL;
+ from_address = g_strdup(compose->account->address);
+ } else {
+ gchar *spec = gtk_editable_get_chars(GTK_EDITABLE(compose->from_name), 0, -1);
+ /* extract name and address */
+ if (strstr(spec, " <") && strstr(spec, ">")) {
+ from_address = g_strdup(strrchr(spec, '<')+1);
+ *(strrchr(from_address, '>')) = '\0';
+ from_name = g_strdup(spec);
+ *(strrchr(from_name, '<')) = '\0';
+ } else {
+ from_name = NULL;
+ from_address = g_strdup(spec);
+ }
+ g_free(spec);
+ }
+ g_free(tmp);
+
+
+ if (from_name && *from_name) {
compose_convert_header
- (compose, buf, sizeof(buf), compose->account->name,
+ (compose, buf, sizeof(buf), from_name,
strlen("From: "), TRUE);
QUOTE_IF_REQUIRED(name, buf);
+
g_string_append_printf(header, "From: %s <%s>\n",
- name, compose->account->address);
+ name, from_address);
} else
- g_string_append_printf(header, "From: %s\n", compose->account->address);
+ g_string_append_printf(header, "From: %s\n", from_address);
+ g_free(from_name);
+ g_free(from_address);
+
/* To */
compose_add_headerfield_from_headerlist(compose, header, "To", ", ");
test_conv_global_out = conv_codeset_strdup(src, CS_INTERNAL, out_codeset);
}
- if (!test_conv_global_out && compose->orig_charset) {
+ if (!test_conv_global_out && compose->orig_charset
+ && strcmp(compose->orig_charset, CS_US_ASCII)) {
out_codeset = compose->orig_charset;
debug_print("failure; trying to convert to %s\n", out_codeset);
test_conv_reply = conv_codeset_strdup(src, CS_INTERNAL, out_codeset);
/* Entry field */
entry = gtk_entry_new();
gtk_widget_show(entry);
+ gtk_tooltips_set_tip(compose->tooltips, entry,
+ _("Use <tab> to autocomplete from addressbook"), NULL);
gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
g_signal_connect(G_OBJECT(entry), "key-press-event",
static GtkWidget *compose_create_header(Compose *compose)
{
- GtkWidget *label;
- GtkWidget *hbox;
GtkWidget *from_optmenu_hbox;
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
count = 0;
/* option menu for selecting accounts */
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(prefs_common.trans_hdr ? _("From:") : "From:");
- gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(header_table), hbox, 0, 1, count, count + 1,
- GTK_FILL, 0, 2, 0);
from_optmenu_hbox = compose_account_option_menu_create(compose);
gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
- 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
count++;
compose->header_table = header_table;
return FALSE;
}
+#if USE_ASPELL
+static void compose_spell_menu_changed(void *data)
+{
+ Compose *compose = (Compose *)data;
+ GSList *items;
+ GtkWidget *menuitem;
+ GtkWidget *parent_item;
+ GtkMenu *menu = GTK_MENU(gtk_menu_new());
+ GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
+ GSList *spell_menu;
+
+ if (compose->gtkaspell == NULL)
+ return;
+
+ parent_item = gtk_item_factory_get_item(ifactory,
+ "/Spelling/Options");
+
+ /* setting the submenu removes /Spelling/Options from the factory
+ * so we need to save it */
+
+ if (parent_item == NULL) {
+ parent_item = compose->aspell_options_menu;
+ gtk_menu_item_remove_submenu(GTK_MENU_ITEM(parent_item));
+ } else
+ compose->aspell_options_menu = parent_item;
+
+ spell_menu = gtkaspell_make_config_menu(compose->gtkaspell);
+
+ spell_menu = g_slist_reverse(spell_menu);
+ for (items = spell_menu;
+ items; items = items->next) {
+ menuitem = GTK_WIDGET(GTK_MENU_ITEM(items->data));
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), GTK_WIDGET(menuitem));
+ gtk_widget_show(GTK_WIDGET(menuitem));
+ }
+ g_slist_free(spell_menu);
+
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(parent_item), GTK_WIDGET(menu));
+
+}
+#endif
+
+static gboolean compose_force_window_origin = TRUE;
static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
gboolean batch)
{
compose->mutex = g_mutex_new();
compose->set_cursor_pos = -1;
+ compose->tooltips = gtk_tooltips_new();
+
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MIN_SIZE);
- gtk_widget_set_uposition(window, prefs_common.compose_x,
+
+ if (compose_force_window_origin)
+ gtk_widget_set_uposition(window, prefs_common.compose_x,
prefs_common.compose_y);
g_signal_connect(G_OBJECT(window), "delete_event",
prefs_common.recheck_when_changing_dict,
prefs_common.use_alternate,
GTK_TEXT_VIEW(text),
- GTK_WINDOW(compose->window));
+ GTK_WINDOW(compose->window),
+ compose_spell_menu_changed,
+ compose);
if (!gtkaspell) {
alertpanel_error(_("Spell checker could not "
"be started.\n%s"),
}
}
compose->gtkaspell = gtkaspell;
+ compose_spell_menu_changed(compose);
#endif
compose_select_account(compose, account, TRUE);
static GtkWidget *compose_account_option_menu_create(Compose *compose)
{
GList *accounts;
+ GtkWidget *hbox;
GtkWidget *optmenu;
GtkWidget *menu;
- gint num = 0, def_menu = 0;
+ GtkWidget *from_name = NULL;
+ gint num = 0, def_menu = 0;
+
accounts = account_get_list();
g_return_val_if_fail(accounts != NULL, NULL);
optmenu = gtk_option_menu_new();
menu = gtk_menu_new();
+ hbox = gtk_hbox_new(FALSE, 6);
+ from_name = gtk_entry_new();
+
+ g_signal_connect_after(G_OBJECT(from_name), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+
for (; accounts != NULL; accounts = accounts->next, num++) {
PrefsAccount *ac = (PrefsAccount *)accounts->data;
GtkWidget *menuitem;
- gchar *name;
+ gchar *name, *from = NULL;
if (ac == compose->account) def_menu = num;
- if (prefs_common.compose_no_markup) {
- if (ac->name)
- name = g_markup_printf_escaped("%s : %s <%s>",
- ac->account_name,
- ac->name, ac->address);
- else
- name = g_markup_printf_escaped("%s : <%s>",
- ac->account_name, ac->address);
- } else {
- if (ac->name)
- name = g_markup_printf_escaped("<i>%s</i> : %s <<b>%s</b>>",
- ac->account_name,
- ac->name, ac->address);
- else
- name = g_markup_printf_escaped("<i>%s</i> : <<b>%s</b>>",
- ac->account_name, ac->address);
+ name = g_markup_printf_escaped("From: <i>%s</i>",
+ ac->account_name);
+
+ if (ac == compose->account) {
+ if (ac->name && *ac->name) {
+ gchar *buf;
+ QUOTE_IF_REQUIRED_NORMAL(buf, ac->name, return NULL);
+ from = g_strdup_printf("%s <%s>",
+ buf, ac->address);
+ gtk_entry_set_text(GTK_ENTRY(from_name), from);
+ } else {
+ from = g_strdup_printf("%s",
+ ac->address);
+ gtk_entry_set_text(GTK_ENTRY(from_name), from);
+ }
}
MENUITEM_ADD(menu, menuitem, name, ac->account_id);
gtk_label_set_use_markup (
GTK_LABEL (gtk_bin_get_child (GTK_BIN (menuitem))),
TRUE);
g_free(name);
+ g_free(from);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(account_activated),
compose);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), def_menu);
- return optmenu;
+ gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
+
+ gtk_tooltips_set_tip(compose->tooltips, optmenu,
+ _("Account to use for this email"), NULL);
+ gtk_tooltips_set_tip(compose->tooltips, from_name,
+ _("Sender address to be used"), NULL);
+
+ compose->from_name = from_name;
+
+ return hbox;
}
static void compose_set_priority_cb(gpointer data,
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE);
+ val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
if (!val)
compose_close(compose);
- else if (val == -2) {
+ else if (val == -1) {
+ alertpanel_error(_("Could not queue message."));
+ } else if (val == -2) {
alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
} else if (val == -3) {
alertpanel_error(_("Could not queue message for sending:\n\n"
- "Signature failed."));
+ "Signature failed: %s"), privacy_get_error());
} else if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
/* Save draft infos */
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;
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
}
- fprintf(fp, "\n");
- if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
+ /* end of headers */
+ fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+
+ if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE, action != COMPOSE_AUTO_SAVE) < 0) {
fclose(fp);
g_unlink(tmp);
g_free(tmp);
goto unlock;
}
g_free(tmp);
- draft->mtime = 0; /* force updating */
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose, TRUE);
procmsg_msginfo_set_flags(newmsginfo, MSG_LOCKED, MSG_DRAFT);
else
procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
- if (compose_use_attach(compose))
+ if (compose_use_attach(compose) && action != COMPOSE_AUTO_SAVE)
procmsg_msginfo_set_flags(newmsginfo, 0,
MSG_HAS_ATTACHMENT);
prefs_common.compose_x = x;
prefs_common.compose_y = y;
- if (compose->sending)
+ if (compose->sending || compose->updating)
return TRUE;
compose_close_cb(compose, 0, NULL);
return TRUE;
return account;
}
-static gboolean compose_close(Compose *compose)
+gboolean compose_close(Compose *compose)
{
gint x, y;
}
}
-void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
- guint action)
+static void compose_reply_from_messageview_real(MessageView *msgview, GSList *msginfo_list,
+ guint action, gboolean opening_multiple)
{
- gchar *body;
+ gchar *body = NULL;
GSList *new_msglist = NULL;
MsgInfo *tmp_msginfo = NULL;
gboolean originally_enc = FALSE;
g_return_if_fail(msginfo_list != NULL);
- if (g_slist_length(msginfo_list) == 1) {
+ if (g_slist_length(msginfo_list) == 1 && !opening_multiple) {
MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
MsgInfo *orig_msginfo = (MsgInfo *)msginfo_list->data;
}
}
- body = messageview_get_selection(msgview);
+ if (!opening_multiple)
+ body = messageview_get_selection(msgview);
if (new_msglist) {
compose = compose_reply_mode((ComposeMode)action, new_msglist, body);
g_free(body);
}
+void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
+ guint action)
+{
+ if ((!prefs_common.forward_as_attachment || action != COMPOSE_FORWARD)
+ && action != COMPOSE_FORWARD_AS_ATTACH && g_slist_length(msginfo_list) > 1) {
+ GSList *cur = msginfo_list;
+ gchar *msg = g_strdup_printf(_("You are about to reply to %d "
+ "messages. Opening the windows "
+ "could take some time. Do you "
+ "want to continue?"),
+ g_slist_length(msginfo_list));
+ if (g_slist_length(msginfo_list) > 9
+ && alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, "+" GTK_STOCK_YES, NULL)
+ != G_ALERTALTERNATE) {
+ g_free(msg);
+ return;
+ }
+ g_free(msg);
+ /* We'll open multiple compose windows */
+ /* let the WM place the next windows */
+ compose_force_window_origin = FALSE;
+ for (; cur; cur = cur->next) {
+ GSList tmplist;
+ tmplist.data = cur->data;
+ tmplist.next = NULL;
+ compose_reply_from_messageview_real(msgview, &tmplist, action, TRUE);
+ }
+ compose_force_window_origin = TRUE;
+ } else {
+ /* forwarding multiple mails as attachments is done via a
+ * single compose window */
+ compose_reply_from_messageview_real(msgview, msginfo_list, action, FALSE);
+ }
+}
+
void compose_set_position(Compose *compose, gint pos)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
projects / claws.git / blobdiff