/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "toolbar.h"
#include "inc.h"
#include "message_search.h"
+#include "combobox.h"
+#include "hooks.h"
enum
{
const gchar *fmt,
const gchar *qmark,
const gchar *body,
- gboolean rewrap);
+ gboolean rewrap,
+ gboolean need_unescape,
+ const gchar *err_msg);
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
static ComposeInsertResult compose_insert_file (Compose *compose,
const gchar *file);
-static void compose_attach_append (Compose *compose,
+static gboolean compose_attach_append (Compose *compose,
const gchar *file,
const gchar *type,
const gchar *content_type);
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 void compose_create_header_entry (Compose *compose);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
-static void compose_update_priority_menu_item(Compose * compose);
+static void compose_remove_header_entries(Compose *compose);
+static void compose_update_priority_menu_item(Compose * compose);
+#if USE_ASPELL
+static void compose_spell_menu_changed (void *data);
+#endif
static void compose_add_field_list ( Compose *compose,
GList *listAddress );
static gboolean compose_edit_size_alloc (GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler);
-static void account_activated (GtkMenuItem *menuitem,
+static void account_activated (GtkComboBox *optmenu,
gpointer data);
static void attach_selected (GtkTreeView *tree_view,
GtkTreePath *tree_path,
static void compose_set_priority_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_reply_change_mode (gpointer data,
+ ComposeMode action,
+ GtkWidget *widget);
static void compose_attach_drag_received_cb (GtkWidget *widget,
GdkDragContext *drag_context,
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
-static gboolean compose_close (Compose *compose);
+static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
static GtkItemFactoryEntry compose_popup_entries[] =
{
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>"},
- {N_("/_Options/Privacy System/None"), NULL, NULL, 0, "<RadioItem>"},
+ {N_("/_Options/Reply _mode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Reply _mode/_Normal"), NULL, compose_reply_change_mode, COMPOSE_REPLY, "<RadioItem>"},
+ {N_("/_Options/Reply _mode/_All"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_ALL, "/Options/Reply mode/Normal"},
+ {N_("/_Options/Reply _mode/_Sender"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_SENDER, "/Options/Reply mode/Normal"},
+ {N_("/_Options/Reply _mode/_Mailing-list"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_LIST, "/Options/Reply mode/Normal"},
+ {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/Privacy _System"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Privacy _System/None"), NULL, NULL, 0, "<RadioItem>"},
{N_("/_Options/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
{N_("/_Options/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
{N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
static GtkTargetEntry compose_mime_types[] =
{
{"text/uri-list", 0, 0},
- {"text/plain", 0, 0},
- {"STRING", 0, 0}
+ {"UTF8_STRING", 0, 0},
+ {"text/plain", 0, 0}
};
static gboolean compose_put_existing_to_front(MsgInfo *info)
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;
return compose_generic_new(account, mailto, NULL, attach_files, NULL);
}
-Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
+Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item, const gchar *mailto)
{
- return compose_generic_new(account, NULL, item, NULL, NULL);
+ return compose_generic_new(account, mailto, item, NULL, NULL);
}
Compose *compose_new_with_list( PrefsAccount *account, GList *listAddress )
compose->gtkaspell)
gtkaspell_change_dict(compose->gtkaspell,
item->prefs->default_dictionary);
+ compose_spell_menu_changed(compose);
#endif
if (account->auto_sig)
} else {
if (mailto) {
compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
- } else if (item) {
+ } else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
}
/*
}
compose_add_field_list( compose, listAddress );
+ if (prefs_common.compose_with_format) {
+ MsgInfo* dummyinfo = NULL;
+
+ if ( prefs_common.compose_subject_format
+ && *prefs_common.compose_subject_format != '\0' )
+ {
+ gchar *subject = NULL;
+ gchar *tmp = NULL;
+ gchar *buf = NULL;
+
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(prefs_common.compose_subject_format)+1);
+ pref_get_unescaped_pref(tmp, prefs_common.compose_subject_format);
+
+ subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+ quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account);
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("New message subject format error."));
+ else
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
+ quote_fmt_reset_vartable();
+
+ g_free(subject);
+ g_free(tmp);
+ }
+
+ if ( prefs_common.compose_body_format
+ && *prefs_common.compose_body_format != '\0' )
+ {
+ GtkTextView *text;
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
+ gchar *tmp = NULL;
+
+ if ( dummyinfo == NULL )
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ text = GTK_TEXT_VIEW(compose->text);
+ buffer = gtk_text_view_get_buffer(text);
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
+ tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
+ compose_quote_fmt(compose, dummyinfo,
+ prefs_common.compose_body_format,
+ NULL, tmp, FALSE, TRUE,
+ _("New message body format error."));
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
+
+ procmsg_msginfo_free( dummyinfo );
+ }
+
if (attach_files) {
gint i;
gchar *file;
MsgInfo *msginfo;
guint list_len;
Compose *compose = NULL;
+ GtkItemFactory *ifactory = NULL;
+
g_return_val_if_fail(msginfo_list != NULL, NULL);
msginfo = (MsgInfo*)g_slist_nth_data(msginfo_list, 0);
default:
g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
}
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ compose->rmode = mode;
+ switch (compose->rmode) {
+ case COMPOSE_REPLY:
+ case COMPOSE_REPLY_WITH_QUOTE:
+ case COMPOSE_REPLY_WITHOUT_QUOTE:
+ case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+ debug_print("reply mode Normal\n");
+ menu_set_active(ifactory, "/Options/Reply mode/Normal", TRUE);
+ compose_reply_change_mode(compose, COMPOSE_REPLY, NULL); /* force update */
+ break;
+ case COMPOSE_REPLY_TO_SENDER:
+ case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+ case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+ debug_print("reply mode Sender\n");
+ menu_set_active(ifactory, "/Options/Reply mode/Sender", TRUE);
+ break;
+ case COMPOSE_REPLY_TO_ALL:
+ case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+ case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+ debug_print("reply mode All\n");
+ menu_set_active(ifactory, "/Options/Reply mode/All", TRUE);
+ break;
+ case COMPOSE_REPLY_TO_LIST:
+ case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
+ case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
+ debug_print("reply mode List\n");
+ menu_set_active(ifactory, "/Options/Reply mode/Mailing-list", TRUE);
+ break;
+ default:
+ break;
+ }
return compose;
}
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);
}
if (compose_parse_header(compose, msginfo) < 0) return NULL;
- compose_reply_set_entry(compose, msginfo, to_all, to_ml,
- to_sender, followup_and_reply_to);
- compose_show_first_last_header(compose, TRUE);
textview = (GTK_TEXT_VIEW(compose->text));
textbuf = gtk_text_view_get_buffer(textview);
compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
- qmark, body, FALSE);
+ qmark, body, FALSE, TRUE,
+ _("Message reply format error."));
+ quote_fmt_reset_vartable();
}
if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
compose_force_encryption(compose, account, FALSE);
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_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
- qmark, body, FALSE);
+ qmark, body, FALSE, TRUE,
+ _("Message forward format error."));
+ quote_fmt_reset_vartable();
compose_attach_parts(compose, msginfo);
procmsg_msginfo_free(full_msginfo);
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_signing = FALSE;
gboolean use_encryption = FALSE;
gchar *privacy_system = NULL;
+ int priority = PRIORITY_NORMAL;
+ MsgInfo *replyinfo = NULL, *fwdinfo = 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 (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Priority: ")) {
param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
- compose->priority = param;
+ priority = param;
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "RMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("RMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ replyinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "FMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("FMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ fwdinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
}
} else {
account = msginfo->folder->folder->account;
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, batch);
+
+ compose->replyinfo = replyinfo;
+ compose->fwdinfo = fwdinfo;
+
+ compose->updating = TRUE;
+ compose->priority = priority;
- compose = compose_create(account, COMPOSE_REEDIT, FALSE);
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;
+ }
+
+ compose->sig_str = compose_get_signature_str(compose);
+
+ 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;
msginfo->subject);
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
- compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE);
+ compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE, FALSE,
+ _("Message redirect format error."));
+ quote_fmt_reset_vartable();
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
compose_colorize_signature(compose);
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);
gchar *subject = NULL;
gchar *body = NULL;
gchar *temp = NULL;
- gint len = 0;
-
- scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body);
+ guint len = 0;
+ gchar *attach = NULL;
+
+ scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body, &attach);
if (to)
compose_entry_append(compose, to, COMPOSE_TO);
compose_wrap_all(compose);
}
+ if (attach) {
+ gchar *utf8_filename = conv_filename_to_utf8(attach);
+ if (utf8_filename) {
+ if (compose_attach_append(compose, attach, utf8_filename, NULL)) {
+ alertpanel_notice(_("The file '%s' has been attached."), attach);
+ }
+ g_free(utf8_filename);
+ } else {
+ alertpanel_error(_("Couldn't attach a file (charset conversion failed)."));
+ }
+ }
g_free(to);
g_free(cc);
g_free(subject);
g_free(body);
+ g_free(attach);
}
static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
extract_address(hentry[H_LIST_POST].body);
if (hentry[H_LIST_POST].body[0] != '\0') {
scan_mailto_url(hentry[H_LIST_POST].body,
- &to, NULL, NULL, NULL, NULL);
+ &to, NULL, NULL, NULL, NULL, NULL);
if (to) {
g_free(compose->ml_post);
compose->ml_post = to;
static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
const gchar *fmt, const gchar *qmark,
- const gchar *body, gboolean rewrap)
+ const gchar *body, gboolean rewrap,
+ gboolean need_unescape,
+ const gchar *err_msg)
{
- static MsgInfo dummyinfo;
+ MsgInfo* dummyinfo = NULL;
gchar *quote_str = NULL;
gchar *buf;
gboolean prev_autowrap;
SIGNAL_BLOCK(buffer);
- if (!msginfo)
- msginfo = &dummyinfo;
+ if (!msginfo) {
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+ msginfo = dummyinfo;
+ }
if (qmark != NULL) {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(qmark);
quote_fmt_parse();
}
if (fmt && *fmt != '\0') {
- while (trimmed_body && strlen(trimmed_body) > 1
- && trimmed_body[0]=='\n')
- *trimmed_body++;
- quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE);
- quote_fmt_scan_string(fmt);
- quote_fmt_parse();
+ if (trimmed_body)
+ while (*trimmed_body == '\n')
+ trimmed_body++;
+
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account);
+ if (need_unescape) {
+ gchar *tmp = NULL;
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(fmt)+1);
+ pref_get_unescaped_pref(tmp, fmt);
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+ g_free(tmp);
+ } else {
+ quote_fmt_scan_string(fmt);
+ quote_fmt_parse();
+ }
buf = quote_fmt_get_buffer();
if (buf == NULL) {
- alertpanel_error(_("Message reply/forward format error."));
+ alertpanel_error(err_msg);
goto error;
}
} else
ok:
SIGNAL_UNBLOCK(buffer);
+ procmsg_msginfo_free( dummyinfo );
return buf;
}
extract_address(my_addr1);
extract_address(my_addr2);
- return !strcmp(my_addr1, my_addr2);
+ return !strcasecmp(my_addr1, my_addr2);
}
static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
if (msginfo->subject && *msginfo->subject) {
gchar *buf, *buf2;
- guchar *p;
+ gchar *p;
buf = p = g_strdup(msginfo->subject);
p += subject_get_prefix_length(p);
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);
GtkTextMark *mark;
GtkTextIter iter, iter_end;
gint cur_pos;
+ gchar *search = NULL;
gboolean prev_autowrap;
+ gboolean found = FALSE, shift = FALSE;
g_return_if_fail(compose->account != NULL);
gtk_text_buffer_get_end_iter(buffer, &iter);
- if (replace && compose->sig_str) {
- gboolean found;
+ search = compose->sig_str;
+again:
+ if (replace && search) {
GtkTextIter first_iter, start_iter, end_iter;
gtk_text_buffer_get_start_iter(buffer, &first_iter);
found = FALSE;
else
found = gtk_text_iter_forward_search(&first_iter,
- compose->sig_str,
+ search,
GTK_TEXT_SEARCH_TEXT_ONLY,
&start_iter, &end_iter,
NULL);
gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
iter = start_iter;
}
+ }
+ if (replace && !found && search && strlen(search) > 2
+ && search[0] == '\n' && search[1] == '\n') {
+ search ++;
+ shift = TRUE;
+ goto again;
}
g_free(compose->sig_str);
compose->sig_str = g_strdup("");
cur_pos = gtk_text_iter_get_offset(&iter);
- gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+ if (shift && found)
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str + 1, -1);
+ else
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
/* skip \n\n */
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
gtk_text_iter_forward_char(&iter);
return COMPOSE_INSERT_SUCCESS;
}
-static void compose_attach_append(Compose *compose, const gchar *file,
+static gboolean compose_attach_append(Compose *compose, const gchar *file,
const gchar *filename,
const gchar *content_type)
{
gboolean has_binary = FALSE;
if (!is_file_exist(file)) {
- g_warning("File %s doesn't exist\n", filename);
- return;
+ alertpanel_error("File %s doesn't exist\n", filename);
+ return FALSE;
}
if ((size = get_file_size(file)) < 0) {
- g_warning("Can't get file size of %s\n", filename);
- return;
+ alertpanel_error("Can't get file size of %s\n", filename);
+ return FALSE;
}
if (size == 0) {
- alertpanel_notice(_("File %s is empty."), filename);
- return;
+ alertpanel_error(_("File %s is empty."), filename);
+ return FALSE;
}
if ((fp = g_fopen(file, "rb")) == NULL) {
alertpanel_error(_("Can't read %s."), filename);
- return;
+ return FALSE;
}
fclose(fp);
g_free(name);
}
+ if (ainfo->name != NULL
+ && !strcmp(ainfo->name, ".")) {
+ g_free(ainfo->name);
+ ainfo->name = NULL;
+ }
+
if (!strcmp(ainfo->content_type, "unknown") || has_binary) {
g_free(ainfo->content_type);
ainfo->content_type = g_strdup("application/octet-stream");
-1);
g_auto_pointer_free(auto_ainfo);
+ return TRUE;
}
static void compose_use_signing(Compose *compose, gboolean use_signing)
{"http://", strcasestr, get_uri_part, make_uri_string},
{"https://", strcasestr, get_uri_part, make_uri_string},
{"ftp://", strcasestr, get_uri_part, make_uri_string},
+ {"sftp://", strcasestr, get_uri_part, make_uri_string},
{"www.", strcasestr, get_uri_part, make_http_string},
{"mailto:", strcasestr, get_uri_part, make_uri_string},
{"@", strcasestr, get_email_part, make_email_string}
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);
activate_privacy_system(compose, account, FALSE);
- if (!init && compose->mode != COMPOSE_REDIRECT)
+ if (!init && compose->mode != COMPOSE_REDIRECT) {
+ undo_block(compose->undostruct);
compose_insert_sig(compose, TRUE);
+ undo_unblock(compose->undostruct);
+ }
}
gboolean compose_check_for_valid_recipient(Compose *compose) {
}
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);
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
g_strstrip(entry);
- if (strcmp(entry, compose->account->auto_cc)
+ if (strcmp(entry, compose->account->auto_bcc)
|| strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
found_other = TRUE;
g_free(entry);
}
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;
}
}
}
+ if (hooks_invoke(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, compose))
+ return FALSE;
+
return TRUE;
}
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;
+ gchar *tmsgid = NULL;
+ MainWindow *mainwin = mainwindow_get_mainwindow();
if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
|| compose->batch == TRUE)
goto bail;
}
- val = compose_queue(compose, &msgnum, &folder, &msgpath);
+ inc_lock();
+ val = compose_queue(compose, &msgnum, &folder, &msgpath, TRUE);
if (val) {
if (compose->batch) {
if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
} else if (val == -3) {
+ if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
- "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 {
goto bail;
}
+ tmsgid = g_strdup(compose->msgid);
if (discard_window) {
compose->sending = FALSE;
compose_close(compose);
}
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;
+ }
+ inc_unlock();
+ g_free(tmsgid);
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, folder, msgnum);
g_free(msgpath);
} else {
- val = procmsg_send_message_queue(msgpath);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
g_unlink(msgpath);
g_free(msgpath);
}
if (val != 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
+ if (tmsgid) {
+ /* make sure we delete that */
+ MsgInfo *tmp = folder_item_get_msginfo_by_msgid(folder, tmsgid);
+ if (tmp) {
+ debug_print("removing %d via %s\n", tmp->msgnum, tmsgid);
+ folder_item_remove_msg(folder, tmp->msgnum);
+ procmsg_msginfo_free(tmp);
+ }
+ }
}
}
if (val == 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
+ if (tmsgid) {
+ /* make sure we delete that */
+ MsgInfo *tmp = folder_item_get_msginfo_by_msgid(folder, tmsgid);
+ if (tmp) {
+ debug_print("removing %d via %s\n", tmp->msgnum, tmsgid);
+ folder_item_remove_msg(folder, tmp->msgnum);
+ procmsg_msginfo_free(tmp);
+ }
+ }
if (!discard_window)
compose_close(compose);
} else {
+ if (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."));
+ inc_unlock();
+ g_free(tmsgid);
return -1;
}
-
+ g_free(tmsgid);
+ inc_unlock();
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
return 0;
bail:
+ inc_unlock();
+ g_free(tmsgid);
compose_allow_user_actions (compose, TRUE);
compose->sending = FALSE;
compose->modified = TRUE;
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
return -1;
}
FILE *fp;
size_t len;
gchar buf[BUFFSIZE];
-
+ int i = 0;
+ gboolean skip = FALSE;
+ gchar *not_included[]={
+ "Return-Path:", "Delivered-To:", "Received:",
+ "Subject:", "X-UIDL:", "AF:",
+ "NF:", "PS:", "SRH:",
+ "SFN:", "DSR:", "MID:",
+ "CFG:", "PT:", "S:",
+ "RQ:", "SSV:", "NSV:",
+ "SSH:", "R:", "MAID:",
+ "NAID:", "RMID:", "FMID:",
+ "SCF:", "RRCPT:", "NG:",
+ "X-Sylpheed-Privacy", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt",
+ "X-Sylpheed-End-Special-Headers:",
+ NULL
+ };
if ((fp = g_fopen(compose->redirect_filename, "rb")) == NULL) {
FILE_OP_ERROR(compose->redirect_filename, "fopen");
return -1;
}
while (procheader_get_one_field_asis(buf, sizeof(buf), fp) != -1) {
- /* should filter returnpath, delivered-to */
- if (g_ascii_strncasecmp(buf, "Return-Path:",
- strlen("Return-Path:")) == 0 ||
- g_ascii_strncasecmp(buf, "Delivered-To:",
- strlen("Delivered-To:")) == 0 ||
- g_ascii_strncasecmp(buf, "Received:",
- strlen("Received:")) == 0 ||
- g_ascii_strncasecmp(buf, "Subject:",
- strlen("Subject:")) == 0 ||
- g_ascii_strncasecmp(buf, "X-UIDL:",
- strlen("X-UIDL:")) == 0)
+ skip = FALSE;
+ for (i = 0; not_included[i] != NULL; i++) {
+ if (g_ascii_strncasecmp(buf, not_included[i],
+ strlen(not_included[i])) == 0) {
+ skip = TRUE;
+ break;
+ }
+ }
+ if (skip)
continue;
-
if (fputs(buf, fdest) == -1)
goto error;
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;
mimetext = procmime_mimeinfo_new();
mimetext->content = MIMECONTENT_MEM;
mimetext->tmp = TRUE; /* must free content later */
- mimetext->data.mem = buf;
+ /* dup'ed because procmime_encode_content can turn it into a tmpfile
+ * and free the data, which we need later. */
+ mimetext->data.mem = g_strdup(buf);
mimetext->type = MIMETYPE_TEXT;
mimetext->subtype = g_strdup("plain");
g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
g_strdup(out_codeset));
+
/* protect trailing spaces when signing message */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system)) {
encoding = ENC_QUOTED_PRINTABLE;
}
+ debug_print("main text: %d bytes encoded as %s in %d\n",
+ strlen(buf), out_codeset, encoding);
+
/* check for line length limit */
if (action == COMPOSE_WRITE_FOR_SEND &&
encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
aval = alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
g_free(msg);
if (aval != G_ALERTALTERNATE) {
+ g_free(buf);
return -1;
}
}
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();
} else
g_node_append(mimemsg->node, mimetext->node);
+ g_free(buf);
+
/* sign message if sending */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system))
}
-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);
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
+ lock = FALSE;
+ fclose(fp);
+ g_unlink(tmp);
+ g_free(tmp);
+ return -5;
}
g_free(encdata);
}
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);
}
!g_ascii_strcasecmp(mimepart->subtype, "rfc822")) {
mimepart->disposition = DISPOSITIONTYPE_INLINE;
} else {
- g_hash_table_insert(mimepart->typeparameters,
+ if (ainfo->name) {
+ g_hash_table_insert(mimepart->typeparameters,
g_strdup("name"), g_strdup(ainfo->name));
- g_hash_table_insert(mimepart->dispositionparameters,
+ g_hash_table_insert(mimepart->dispositionparameters,
g_strdup("filename"), g_strdup(ainfo->name));
- mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
+ mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
+ }
}
if (compose->use_signing) {
} 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);
header = g_string_sized_new(64);
/* Date */
- if (compose->account->add_date) {
- get_rfc822_date(buf, sizeof(buf));
- g_string_append_printf(header, "Date: %s\n", buf);
- }
+ get_rfc822_date(buf, sizeof(buf));
+ g_string_append_printf(header, "Date: %s\n", buf);
/* 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", ", ");
/* 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",
G_CALLBACK(compose_drag_drop),
compose);
- address_completion_register_entry(GTK_ENTRY(entry));
+ address_completion_register_entry(GTK_ENTRY(entry), TRUE);
headerentry->compose = compose;
headerentry->combo = combo;
gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
}
+static void compose_remove_header_entries(Compose *compose)
+{
+ GSList *list;
+ for (list = compose->header_list; list; list = list->next) {
+ ComposeHeaderEntry *headerentry =
+ (ComposeHeaderEntry *)list->data;
+ gtk_widget_destroy(headerentry->combo);
+ gtk_widget_destroy(headerentry->entry);
+ g_free(headerentry);
+ }
+ g_slist_free(compose->header_list);
+ compose->header_list = NULL;
+ compose->header_nextrow = 1;
+ compose_create_header_entry(compose);
+}
+
static GtkWidget *compose_create_header(Compose *compose)
{
- GtkWidget *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;
gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
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",
compose->tmpl_menu = tmpl_menu;
compose->mode = mode;
+ compose->rmode = mode;
compose->targetinfo = NULL;
compose->replyinfo = NULL;
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);
if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO);
+ menu_set_sensitive(ifactory, "/Options/Reply mode", compose->mode == COMPOSE_REPLY);
if (account->protocol != A_NNTP)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
static GtkWidget *compose_account_option_menu_create(Compose *compose)
{
GList *accounts;
+ GtkWidget *hbox;
GtkWidget *optmenu;
- GtkWidget *menu;
- gint num = 0, def_menu = 0;
+ GtkWidget *optmenubox;
+ GtkListStore *menu;
+ GtkTreeIter iter;
+ 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();
+ optmenubox = gtk_event_box_new();
+ optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
+
+ 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);
+ COMBOBOX_ADD(menu, name, ac->account_id);
g_free(name);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(account_activated),
- compose);
+ g_free(from);
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), def_menu);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), def_menu);
- return optmenu;
+ g_signal_connect(G_OBJECT(optmenu), "changed",
+ G_CALLBACK(account_activated),
+ compose);
+
+ gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
+
+ gtk_tooltips_set_tip(compose->tooltips, optmenubox,
+ _("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->priority = action;
}
+static void compose_reply_change_mode(gpointer data,
+ ComposeMode action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *) data;
+ gboolean was_modified = compose->modified;
+
+ gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;
+ if (compose->mode != COMPOSE_REPLY)
+ return;
+ g_return_if_fail(compose->replyinfo != NULL);
+
+ if (action == COMPOSE_REPLY && prefs_common.default_reply_list)
+ ml = TRUE;
+ if (action == COMPOSE_REPLY && compose->rmode == COMPOSE_FOLLOWUP_AND_REPLY_TO)
+ followup = TRUE;
+ if (action == COMPOSE_REPLY_TO_ALL)
+ all = TRUE;
+ if (action == COMPOSE_REPLY_TO_SENDER)
+ sender = TRUE;
+ if (action == COMPOSE_REPLY_TO_LIST)
+ ml = TRUE;
+
+ compose_remove_header_entries(compose);
+ compose_reply_set_entry(compose, compose->replyinfo, all, ml, sender, followup);
+ compose_show_first_last_header(compose, TRUE);
+ compose->modified = was_modified;
+ compose_set_title(compose);
+}
+
static void compose_update_priority_menu_item(Compose * compose)
{
GtkItemFactory *ifactory;
gchar *qmark;
gchar *parsed_str = NULL;
gint cursor_pos = 0;
+ const gchar *err_msg = _("Template body format error.");
if (!tmpl) return;
/* process the body */
text = GTK_TEXT_VIEW(compose->text);
buffer = gtk_text_view_get_buffer(text);
- if (replace)
- gtk_text_buffer_set_text(buffer, "", -1);
+ if (tmpl->value) {
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
- mark = gtk_text_buffer_get_insert(buffer);
- gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ if (compose->replyinfo != NULL) {
+
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark, NULL, FALSE, FALSE, err_msg);
+
+ } else if (compose->fwdinfo != NULL) {
+
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+ parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
+ tmpl->value, qmark, NULL, FALSE, FALSE, err_msg);
- if (tmpl->value) {
- if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
- parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
- NULL, NULL, FALSE);
} else {
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
-
- if (compose->replyinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark, NULL, FALSE);
- else if (compose->fwdinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
- tmpl->value, qmark, NULL, FALSE);
- else
- parsed_str = NULL;
- }
- }
+ MsgInfo* dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ GtkTextIter start, end;
+ gchar *tmp = NULL;
+
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
+ tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
+ /* clear the buffer now */
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+
+ parsed_str = compose_quote_fmt(compose, dummyinfo,
+ tmpl->value, qmark, tmp, FALSE, FALSE, err_msg);
+ procmsg_msginfo_free( dummyinfo );
+
+ g_free( tmp );
+ }
+ } else {
+ if (replace)
+ gtk_text_buffer_set_text(buffer, "", -1);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ }
+
if (replace && parsed_str && compose->account->auto_sig)
compose_insert_sig(compose, FALSE);
}
/* process the other fields */
+
compose_template_apply_fields(compose, tmpl);
-
+ quote_fmt_reset_vartable();
compose_changed_cb(NULL, compose);
}
void compose_template_apply_fields(Compose *compose, Template *tmpl)
{
- static MsgInfo dummyinfo;
+ MsgInfo* dummyinfo = NULL;
MsgInfo *msginfo = NULL;
gchar *buf = NULL;
msginfo = compose->replyinfo;
else if (compose->fwdinfo != NULL)
msginfo = compose->fwdinfo;
- else
- msginfo = &dummyinfo;
+ else {
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+ msginfo = dummyinfo;
+ }
if (tmpl->to && *tmpl->to != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->to);
quote_fmt_parse();
}
if (tmpl->cc && *tmpl->cc != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->cc);
quote_fmt_parse();
}
if (tmpl->bcc && *tmpl->bcc != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->bcc);
quote_fmt_parse();
/* process the subject */
if (tmpl->subject && *tmpl->subject != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
quote_fmt_scan_string(tmpl->subject);
quote_fmt_parse();
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
}
}
+
+ procmsg_msginfo_free( dummyinfo );
}
static void compose_destroy(Compose *compose)
{
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
+
compose_list = g_list_remove(compose_list, compose);
if (compose->updating) {
gtk_widget_destroy(compose->paned);
gtk_widget_destroy(compose->popupmenu);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_remove_selection_clipboard(buffer, clipboard);
+
gtk_widget_destroy(compose->window);
toolbar_destroy(compose->toolbar);
g_free(compose->toolbar);
{
GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- GtkOptionMenu *optmenu;
+ GtkComboBox *optmenu;
GtkTreeSelection *selection;
GList *sel;
GtkTreeModel *model;
gtk_widget_show(attach_prop.window);
manage_window_set_transient(GTK_WINDOW(attach_prop.window));
- optmenu = GTK_OPTION_MENU(attach_prop.encoding_optmenu);
+ optmenu = GTK_COMBO_BOX(attach_prop.encoding_optmenu);
if (ainfo->encoding == ENC_UNKNOWN)
- menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
- GINT_TO_POINTER(ENC_BASE64));
+ combobox_select_by_data(optmenu, ENC_BASE64);
else
- menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
- GINT_TO_POINTER(ainfo->encoding));
+ combobox_select_by_data(optmenu, ainfo->encoding);
gtk_entry_set_text(GTK_ENTRY(attach_prop.mimetype_entry),
ainfo->content_type ? ainfo->content_type : "");
gchar *cnttype = NULL;
gchar *file = NULL;
off_t size = 0;
- GtkWidget *menu;
- GtkWidget *menuitem;
cancelled = FALSE;
gtk_main();
}
}
- menu = gtk_option_menu_get_menu(optmenu);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- ainfo->encoding = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ ainfo->encoding = combobox_get_active_data(optmenu);
entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
if (*entry_text != '\0') {
GtkWidget *mimetype_entry;
GtkWidget *hbox;
GtkWidget *optmenu;
- GtkWidget *optmenu_menu;
- GtkWidget *menuitem;
+ GtkListStore *optmenu_menu;
GtkWidget *path_entry;
GtkWidget *filename_entry;
GtkWidget *hbbox;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
GList *mime_type_list, *strlist;
+ GtkTreeIter iter;
debug_print("Creating attach_property window...\n");
gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- optmenu = gtk_option_menu_new();
- gtk_box_pack_start(GTK_BOX(hbox), optmenu, TRUE, TRUE, 0);
-
- optmenu_menu = gtk_menu_new();
- MENUITEM_ADD(optmenu_menu, menuitem, "7bit", ENC_7BIT);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
- MENUITEM_ADD(optmenu_menu, menuitem, "8bit", ENC_8BIT);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
- MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable",
- ENC_QUOTED_PRINTABLE);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+ optmenu = gtkut_sc_combobox_create(NULL, TRUE);
+ optmenu_menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
- MENUITEM_ADD(optmenu_menu, menuitem, "base64", ENC_BASE64);
+ COMBOBOX_ADD(optmenu_menu, "7bit", ENC_7BIT);
+ COMBOBOX_ADD(optmenu_menu, "8bit", ENC_8BIT);
+ COMBOBOX_ADD(optmenu_menu, "quoted-printable", ENC_QUOTED_PRINTABLE);
+ COMBOBOX_ADD(optmenu_menu, "base64", ENC_BASE64);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), 0);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+ gtk_box_pack_start(GTK_BOX(hbox), optmenu, TRUE, TRUE, 0);
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
return TRUE;
}
-static void account_activated(GtkMenuItem *menuitem, gpointer data)
+static void account_activated(GtkComboBox *optmenu, gpointer data)
{
Compose *compose = (Compose *)data;
PrefsAccount *ac;
gchar *folderidentifier;
+ gint account_id = 0;
+ GtkTreeModel *menu;
+ GtkTreeIter iter;
- ac = account_find_from_id(
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
+ /* Get ID of active account in the combo box */
+ menu = gtk_combo_box_get_model(optmenu);
+ gtk_combo_box_get_active_iter(optmenu, &iter);
+ gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
+
+ ac = account_find_from_id(account_id);
g_return_if_fail(ac != NULL);
if (ac != compose->account)
if (prefs_common.work_offline &&
!inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ _("Claws Mail needs network access in order "
"to send this email.")))
return;
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE);
- if (!val)
+ inc_lock();
+ val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
+ inc_unlock();
+
+ 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) {
+ if (privacy_peek_error())
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."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
}
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
}
void compose_draft (gpointer data)
/* 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) {
+ /* Message-ID of message replying to */
+ if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
+ gchar *folderid;
+
+ folderid = folder_item_get_identifier(compose->replyinfo->folder);
+ fprintf(fp, "RMID:%s\t%d\t%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\t%d\t%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
+ g_free(folderid);
+ }
+
+ /* 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;
GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
GtkTextIter start_iter, end_iter;
gint start, end;
-
gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(clip));
if (contents == NULL)
return;
+ undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
+
/* we shouldn't delete the selection when middle-click-pasting, or we
* can't mid-click-paste our own selection */
- if (clip != GDK_SELECTION_PRIMARY)
+ if (clip != GDK_SELECTION_PRIMARY) {
gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
+ }
if (insert_place == NULL) {
/* if insert_place isn't specified, insert at the cursor.
gtk_text_iter_backward_char(&start_iter);
compose_beautify_paragraph(compose, &start_iter, TRUE);
}
-
} else if (GTK_IS_EDITABLE(entry))
gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
if (gdk_atom_name(data->type) &&
!strcmp(gdk_atom_name(data->type), "text/uri-list")
&& gtk_drag_get_source_widget(context) !=
- mainwindow_get_mainwindow()->summaryview->ctree) {
+ summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next)
compose_attach_append
list_free_strings(list);
g_list_free(list);
} else if (gtk_drag_get_source_widget(context)
- == mainwindow_get_mainwindow()->summaryview->ctree) {
+ == summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
/* comes from our summaryview */
SummaryView * summaryview = NULL;
GSList * list = NULL, *cur = NULL;
/* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
* does not work */
if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ AlertValue val = G_ALERTDEFAULT;
+
+ switch (prefs_common.compose_dnd_mode) {
+ case COMPOSE_DND_ASK:
+ val = alertpanel_full(_("Insert or attach?"),
+ _("Do you want to insert the contents of the file(s) "
+ "into the message body, or attach it to the email?"),
+ GTK_STOCK_CANCEL, _("+_Insert"), _("_Attach"),
+ TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+ break;
+ case COMPOSE_DND_INSERT:
+ val = G_ALERTALTERNATE;
+ break;
+ case COMPOSE_DND_ATTACH:
+ val = G_ALERTOTHER;
+ break;
+ default:
+ /* unexpected case */
+ g_warning("error: unexpected compose_dnd_mode option value in compose_insert_drag_received_cb()");
+ }
+
+ if (val & G_ALERTDISABLE) {
+ val &= ~G_ALERTDISABLE;
+ /* remember what action to perform by default, only if we don't click Cancel */
+ if (val == G_ALERTALTERNATE)
+ prefs_common.compose_dnd_mode = COMPOSE_DND_INSERT;
+ else if (val == G_ALERTOTHER)
+ prefs_common.compose_dnd_mode = COMPOSE_DND_ATTACH;
+ }
+
+ if (val == G_ALERTDEFAULT || val == G_ALERTCANCEL) {
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ return;
+ } else if (val == G_ALERTOTHER) {
+ compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
+ return;
+ }
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next) {
compose_insert_file(compose, (const gchar *)tmp->data);
mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
gtk_text_buffer_place_cursor(buffer, iter);
- compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE);
+ compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE, FALSE,
+ _("Quote format error."));
+ quote_fmt_reset_vartable();
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation - 1));
if (!account && prefs_common.forward_account_autosel) {
gchar cc[BUFFSIZE];
if (!procheader_get_header_from_msginfo
- (msginfo, cc,sizeof cc , "CC:")) { /* Found a CC header */
- extract_address(cc);
- account = account_find_from_address(cc);
+ (msginfo, cc,sizeof cc , "Cc:")) {
+ gchar *buf = cc + strlen("Cc:");
+ extract_address(buf);
+ account = account_find_from_address(buf);
+ }
+ }
+
+ if (!account && prefs_common.forward_account_autosel) {
+ gchar deliveredto[BUFFSIZE];
+ if (!procheader_get_header_from_msginfo
+ (msginfo, deliveredto,sizeof deliveredto , "Delivered-To:")) {
+ gchar *buf = deliveredto + strlen("Delivered-To:");
+ extract_address(buf);
+ account = account_find_from_address(buf);
}
}
return 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);
return gtkut_text_view_search_string_backward(text, str, case_sens);
}
+/* allocate a msginfo structure and populate its data from a compose data structure */
+static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
+{
+ MsgInfo *newmsginfo;
+ GSList *list;
+ gchar buf[BUFFSIZE];
+
+ g_return_val_if_fail( compose != NULL, NULL );
+
+ newmsginfo = procmsg_msginfo_new();
+
+ /* date is now */
+ get_rfc822_date(buf, sizeof(buf));
+ newmsginfo->date = g_strdup(buf);
+
+ /* from */
+ if (compose->from_name) {
+ newmsginfo->from = gtk_editable_get_chars(GTK_EDITABLE(compose->from_name), 0, -1);
+ newmsginfo->fromname = procheader_get_fromname(newmsginfo->from);
+ }
+
+ /* subject */
+ if (compose->subject_entry)
+ newmsginfo->subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+
+ /* to, cc, reply-to, newsgroups */
+ for (list = compose->header_list; list; list = list->next) {
+ gchar *header = gtk_editable_get_chars(
+ GTK_EDITABLE(
+ GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
+ gchar *entry = gtk_editable_get_chars(
+ GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
+
+ if ( strcasecmp(header, (prefs_common.trans_hdr ? gettext("To:") : "To:")) == 0 ) {
+ if ( newmsginfo->to == NULL ) {
+ newmsginfo->to = g_strdup(entry);
+ } else {
+ gchar *tmp = g_strconcat(newmsginfo->to, ", ", entry, NULL);
+ g_free(newmsginfo->to);
+ newmsginfo->to = tmp;
+ }
+ } else
+ if ( strcasecmp(header, (prefs_common.trans_hdr ? gettext("Cc:") : "Cc:")) == 0 ) {
+ if ( newmsginfo->cc == NULL ) {
+ newmsginfo->cc = g_strdup(entry);
+ } else {
+ gchar *tmp = g_strconcat(newmsginfo->cc, ", ", entry, NULL);
+ g_free(newmsginfo->cc);
+ newmsginfo->cc = tmp;
+ }
+ } else
+ if ( strcasecmp(header,
+ (prefs_common.trans_hdr ? gettext("Newsgroups:") : "Newsgroups:")) == 0 ) {
+ if ( newmsginfo->newsgroups == NULL ) {
+ newmsginfo->newsgroups = g_strdup(entry);
+ } else {
+ gchar *tmp = g_strconcat(newmsginfo->newsgroups, ", ", entry, NULL);
+ g_free(newmsginfo->newsgroups);
+ newmsginfo->newsgroups = tmp;
+ }
+ }
+
+ g_free(header);
+ g_free(entry);
+ }
+
+ /* other data is unset */
+
+ return newmsginfo;
+}
+
/*
* End of Source.
*/
projects / claws.git / blobdiff