/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
# include <wctype.h>
#endif
-#include "sylpheed.h"
+#include "claws.h"
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
#include "inc.h"
#include "message_search.h"
#include "combobox.h"
+#include "hooks.h"
+#include "privacy.h"
+#include "timing.h"
enum
{
COMPOSE_INSERT_NO_FILE
} ComposeInsertResult;
-typedef enum
-{
- COMPOSE_QUIT_EDITING,
- COMPOSE_KEEP_EDITING,
- COMPOSE_AUTO_SAVE
-} ComposeDraftAction;
-
typedef enum
{
COMPOSE_WRITE_FOR_SEND,
COMPOSE_WRITE_FOR_STORE
} ComposeWriteType;
+typedef enum
+{
+ COMPOSE_QUOTE_FORCED,
+ COMPOSE_QUOTE_CHECK,
+ COMPOSE_QUOTE_SKIP
+} ComposeQuoteMode;
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
static GList *compose_list = NULL;
-Compose *compose_generic_new (PrefsAccount *account,
+static Compose *compose_generic_new (PrefsAccount *account,
const gchar *to,
FolderItem *item,
GPtrArray *attach_files,
GList *listAddress );
static Compose *compose_create (PrefsAccount *account,
+ FolderItem *item,
ComposeMode mode,
gboolean batch);
+static void compose_entry_mark_default_to (Compose *compose,
+ const gchar *address);
+static Compose *compose_followup_and_reply_to (MsgInfo *msginfo,
+ ComposeQuoteMode quote_mode,
+ gboolean to_all,
+ gboolean to_sender,
+ const gchar *body);
+static Compose *compose_forward_multiple (PrefsAccount *account,
+ GSList *msginfo_list);
+static Compose *compose_reply (MsgInfo *msginfo,
+ ComposeQuoteMode quote_mode,
+ gboolean to_all,
+ gboolean to_ml,
+ gboolean to_sender,
+ const gchar *body);
+static Compose *compose_reply_mode (ComposeMode mode,
+ GSList *msginfo_list,
+ gchar *body);
+static void compose_template_apply_fields(Compose *compose, Template *tmpl);
+static void compose_update_privacy_systems_menu(Compose *compose);
+
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
static void compose_set_out_encoding (Compose *compose);
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);
static void compose_attach_parts (Compose *compose,
MsgInfo *msginfo);
-static void compose_beautify_paragraph (Compose *compose,
+static gboolean compose_beautify_paragraph (Compose *compose,
GtkTextIter *par_iter,
gboolean force);
static void compose_wrap_all (Compose *compose);
static gboolean compose_check_for_valid_recipient
(Compose *compose);
static gboolean compose_check_entries (Compose *compose,
- gboolean check_subject);
+ gboolean check_everything);
static gint compose_write_to_file (Compose *compose,
FILE *fp,
gint action,
const gchar *file);
static gint compose_remove_reedit_target (Compose *compose,
gboolean force);
-void compose_remove_draft (Compose *compose);
+static void compose_remove_draft (Compose *compose);
static gint compose_queue_sub (Compose *compose,
gint *msgnum,
FolderItem **item,
gpointer data);
static void compose_create_header_entry (Compose *compose);
-static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
+static void compose_add_header_entry (Compose *compose, const gchar *header, gchar *text);
+static void compose_remove_header_entries(Compose *compose);
+
static void compose_update_priority_menu_item(Compose * compose);
#if USE_ASPELL
static void compose_spell_menu_changed (void *data);
static gboolean attach_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-
static void compose_send_cb (gpointer data,
guint action,
GtkWidget *widget);
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,
const gchar *text,
gint len,
Compose *compose);
-static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
- gboolean to_all, gboolean to_ml,
+static Compose *compose_generic_reply(MsgInfo *msginfo,
+ ComposeQuoteMode quote_mode,
+ gboolean to_all,
+ gboolean to_ml,
gboolean to_sender,
gboolean followup_and_reply_to,
const gchar *body);
-gboolean compose_headerentry_changed_cb (GtkWidget *entry,
+static gboolean compose_headerentry_changed_cb (GtkWidget *entry,
ComposeHeaderEntry *headerentry);
-gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
+static gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
+static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
+
+#ifdef USE_ASPELL
+static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
+ FolderItem *folder_item);
+#endif
+
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
{N_("/_Remove"), NULL, compose_attach_remove_selected, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Properties..."), NULL, compose_attach_property, 0, NULL}
};
static GtkItemFactoryEntry compose_entries[] =
{
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Send"), "<control>Return",
+ {N_("/_Message/S_end"), "<control>Return",
compose_send_cb, 0, NULL},
{N_("/_Message/Send _later"), "<shift><control>S",
compose_send_later_cb, 0, NULL},
NULL, NULL, 0, "<Branch>"},
#endif
{N_("/_Options"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Privacy System/None"), NULL, NULL, 0, "<RadioItem>"},
+ {N_("/_Options/Reply _mode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Reply _mode/_Normal"), NULL, compose_reply_change_mode, COMPOSE_REPLY, "<RadioItem>"},
+ {N_("/_Options/Reply _mode/_All"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_ALL, "/Options/Reply mode/Normal"},
+ {N_("/_Options/Reply _mode/_Sender"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_SENDER, "/Options/Reply mode/Normal"},
+ {N_("/_Options/Reply _mode/_Mailing-list"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_LIST, "/Options/Reply mode/Normal"},
+ {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/Privacy _System"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Privacy _System/None"), NULL, NULL, 0, "<RadioItem>"},
{N_("/_Options/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
{N_("/_Options/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
{N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
}
if (prefs_common.enable_color && prefs_common.enable_bgcolor) {
- gtk_text_buffer_create_tag(buffer, "quote0",
+ compose->quote0_tag = gtk_text_buffer_create_tag(buffer, "quote0",
"foreground-gdk", "e_color1,
"paragraph-background-gdk", "e_bgcolor1,
NULL);
- gtk_text_buffer_create_tag(buffer, "quote1",
+ compose->quote1_tag = gtk_text_buffer_create_tag(buffer, "quote1",
"foreground-gdk", "e_color2,
"paragraph-background-gdk", "e_bgcolor2,
NULL);
- gtk_text_buffer_create_tag(buffer, "quote2",
+ compose->quote2_tag = gtk_text_buffer_create_tag(buffer, "quote2",
"foreground-gdk", "e_color3,
"paragraph-background-gdk", "e_bgcolor3,
NULL);
} else {
- gtk_text_buffer_create_tag(buffer, "quote0",
+ compose->quote0_tag = gtk_text_buffer_create_tag(buffer, "quote0",
"foreground-gdk", "e_color1,
NULL);
- gtk_text_buffer_create_tag(buffer, "quote1",
+ compose->quote1_tag = gtk_text_buffer_create_tag(buffer, "quote1",
"foreground-gdk", "e_color2,
NULL);
- gtk_text_buffer_create_tag(buffer, "quote2",
+ compose->quote2_tag = gtk_text_buffer_create_tag(buffer, "quote2",
"foreground-gdk", "e_color3,
NULL);
}
- gtk_text_buffer_create_tag(buffer, "signature",
+ compose->signature_tag = gtk_text_buffer_create_tag(buffer, "signature",
"foreground-gdk", &signature_color,
NULL);
- gtk_text_buffer_create_tag(buffer, "link",
+
+ compose->uri_tag = gtk_text_buffer_create_tag(buffer, "link",
"foreground-gdk", &uri_color,
NULL);
compose->no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
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 )
GtkTextBuffer *textbuf;
GtkTextIter iter;
GtkItemFactory *ifactory;
+ const gchar *subject_format = NULL;
+ const gchar *body_format = NULL;
if (item && item->prefs && item->prefs->enable_default_account)
account = account_find_from_id(item->prefs->default_account);
if (!account) account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_NEW, FALSE);
+ compose = compose_create(account, item, COMPOSE_NEW, FALSE);
ifactory = gtk_item_factory_from_widget(compose->menubar);
undo_block(compose->undostruct);
#ifdef USE_ASPELL
- if (item && item->prefs && item->prefs->enable_default_dictionary &&
- compose->gtkaspell)
- gtkaspell_change_dict(compose->gtkaspell,
- item->prefs->default_dictionary);
- compose_spell_menu_changed(compose);
+ compose_set_dictionaries_from_folder_prefs(compose, item);
#endif
if (account->auto_sig)
}
compose_add_field_list( compose, listAddress );
+ if (item && item->prefs && item->prefs->compose_with_format) {
+ subject_format = item->prefs->compose_subject_format;
+ body_format = item->prefs->compose_body_format;
+ } else if (account->compose_with_format) {
+ subject_format = account->compose_subject_format;
+ body_format = account->compose_body_format;
+ } else if (prefs_common.compose_with_format) {
+ subject_format = prefs_common.compose_subject_format;
+ body_format = prefs_common.compose_body_format;
+ }
+
+ if (subject_format || body_format) {
+ MsgInfo* dummyinfo = NULL;
+
+ if ( subject_format
+ && *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(subject_format)+1);
+ pref_get_unescaped_pref(tmp, subject_format);
+
+ subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+#ifdef USE_ASPELL
+ quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account);
+#endif
+ 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 ( body_format
+ && *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,
+ body_format,
+ NULL, tmp, FALSE, TRUE,
+ _("New message body format error at line %d."));
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
+
+ procmsg_msginfo_free( dummyinfo );
+ }
+
if (attach_files) {
gint i;
gchar *file;
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+ compose->draft_timeout_tag = -1;
compose->modified = FALSE;
compose_set_title(compose);
return compose;
}
}
if (privacy != NULL) {
- compose->privacy_system = g_strdup(privacy);
+ if (compose->privacy_system == NULL)
+ compose->privacy_system = g_strdup(privacy);
compose_update_privacy_system_menu_item(compose, FALSE);
compose_use_encryption(compose, TRUE);
}
}
}
if (privacy != NULL) {
- compose->privacy_system = g_strdup(privacy);
+ if (compose->privacy_system == NULL)
+ compose->privacy_system = g_strdup(privacy);
compose_update_privacy_system_menu_item(compose, FALSE);
compose_use_signing(compose, TRUE);
}
}
-Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
+static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
{
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);
switch (mode) {
case COMPOSE_REPLY:
- compose = compose_reply(msginfo, prefs_common.reply_with_quote,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_CHECK,
FALSE, prefs_common.default_reply_list, FALSE, body);
break;
case COMPOSE_REPLY_WITH_QUOTE:
- compose = compose_reply(msginfo, TRUE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_FORCED,
FALSE, prefs_common.default_reply_list, FALSE, body);
break;
case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose = compose_reply(msginfo, FALSE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_SKIP,
FALSE, prefs_common.default_reply_list, FALSE, NULL);
break;
case COMPOSE_REPLY_TO_SENDER:
- compose = compose_reply(msginfo, prefs_common.reply_with_quote,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_CHECK,
FALSE, FALSE, TRUE, body);
break;
case COMPOSE_FOLLOWUP_AND_REPLY_TO:
compose = compose_followup_and_reply_to(msginfo,
- prefs_common.reply_with_quote,
+ COMPOSE_QUOTE_CHECK,
FALSE, FALSE, body);
break;
case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
- compose = compose_reply(msginfo, TRUE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_FORCED,
FALSE, FALSE, TRUE, body);
break;
case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
- compose = compose_reply(msginfo, FALSE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_SKIP,
FALSE, FALSE, TRUE, NULL);
break;
case COMPOSE_REPLY_TO_ALL:
- compose = compose_reply(msginfo, prefs_common.reply_with_quote,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_CHECK,
TRUE, FALSE, FALSE, body);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose = compose_reply(msginfo, TRUE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_FORCED,
TRUE, FALSE, FALSE, body);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose = compose_reply(msginfo, FALSE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_SKIP,
TRUE, FALSE, FALSE, NULL);
break;
case COMPOSE_REPLY_TO_LIST:
- compose = compose_reply(msginfo, prefs_common.reply_with_quote,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_CHECK,
FALSE, TRUE, FALSE, body);
break;
case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
- compose = compose_reply(msginfo, TRUE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_FORCED,
FALSE, TRUE, FALSE, body);
break;
case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
- compose = compose_reply(msginfo, FALSE,
+ compose = compose_reply(msginfo, COMPOSE_QUOTE_SKIP,
FALSE, TRUE, FALSE, NULL);
break;
case COMPOSE_FORWARD:
compose = compose_redirect(NULL, msginfo, FALSE);
break;
default:
- g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
+ g_warning("compose_reply_mode(): 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;
}
-Compose *compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
- gboolean to_ml, gboolean to_sender,
+static Compose *compose_reply(MsgInfo *msginfo,
+ ComposeQuoteMode quote_mode,
+ gboolean to_all,
+ gboolean to_ml,
+ gboolean to_sender,
const gchar *body)
{
- return compose_generic_reply(msginfo, quote, to_all, to_ml,
+ return compose_generic_reply(msginfo, quote_mode, to_all, to_ml,
to_sender, FALSE, body);
}
-Compose *compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
+static Compose *compose_followup_and_reply_to(MsgInfo *msginfo,
+ ComposeQuoteMode quote_mode,
gboolean to_all,
gboolean to_sender,
const gchar *body)
{
- return compose_generic_reply(msginfo, quote, to_all, FALSE,
+ return compose_generic_reply(msginfo, quote_mode, to_all, FALSE,
to_sender, TRUE, body);
}
info = compose->targetinfo;
}
if (info) {
- MimeInfo *mimeinfo = procmime_scan_message(info);
+ MimeInfo *mimeinfo = procmime_scan_message_short(info);
MimeInfo *partinfo = mimeinfo;
while (partinfo && partinfo->type != MIMETYPE_TEXT)
partinfo = procmime_mimeinfo_next(partinfo);
compose); \
}
-static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
+static Compose *compose_generic_reply(MsgInfo *msginfo,
+ ComposeQuoteMode quote_mode,
gboolean to_all, gboolean to_ml,
gboolean to_sender,
gboolean followup_and_reply_to,
GtkItemFactory *ifactory;
Compose *compose;
PrefsAccount *account = NULL;
- PrefsAccount *reply_account;
GtkTextView *textview;
GtkTextBuffer *textbuf;
-
+ gboolean quote = FALSE;
+ const gchar *qmark = NULL;
+ const gchar *body_fmt = NULL;
+ START_TIMING("");
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
account = account_get_reply_account(msginfo, prefs_common.reply_account_autosel);
-
- g_return_val_if_fail(account != NULL, NULL);
- if (to_sender && account->protocol == A_NNTP &&
- !followup_and_reply_to) {
- reply_account =
- account_find_from_address(account->address);
- if (!reply_account)
- reply_account = compose_current_mail_account();
- if (!reply_account)
- return NULL;
- } else
- reply_account = account;
+ g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_REPLY, FALSE);
+ compose = compose_create(account, msginfo->folder, COMPOSE_REPLY, FALSE);
compose->updating = TRUE;
}
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);
undo_block(compose->undostruct);
#ifdef USE_ASPELL
- if (msginfo->folder && msginfo->folder->prefs &&
- msginfo->folder->prefs &&
- msginfo->folder->prefs->enable_default_dictionary &&
- compose->gtkaspell)
- gtkaspell_change_dict(compose->gtkaspell,
- msginfo->folder->prefs->default_dictionary);
+ compose_set_dictionaries_from_folder_prefs(compose, msginfo->folder);
#endif
- if (quote) {
- gchar *qmark;
+ if (quote_mode == COMPOSE_QUOTE_FORCED ||
+ (quote_mode == COMPOSE_QUOTE_CHECK && prefs_common.reply_with_quote)) {
+ /* use the reply format of folder (if enabled), or the account's one
+ (if enabled) or fallback to the global reply format, which is always
+ enabled (even if empty), and use the relevant quotemark */
+ quote = TRUE;
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs->reply_with_format) {
+ qmark = msginfo->folder->prefs->reply_quotemark;
+ body_fmt = msginfo->folder->prefs->reply_body_format;
+
+ } else if (account->reply_with_format) {
+ qmark = account->reply_quotemark;
+ body_fmt = account->reply_body_format;
- if (prefs_common.quotemark && *prefs_common.quotemark)
+ } else {
qmark = prefs_common.quotemark;
- else
- qmark = "> ";
+ body_fmt = prefs_common.quotefmt;
+ }
+ }
+ if (quote) {
+ /* empty quotemark is not allowed */
+ if (qmark == NULL || *qmark == '\0')
+ qmark = "> ";
compose_quote_fmt(compose, compose->replyinfo,
- prefs_common.quotefmt,
- qmark, body, FALSE);
+ body_fmt, qmark, body, FALSE, TRUE,
+ _("Message reply format error at line %d."));
quote_fmt_reset_vartable();
}
- if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
+
+ if (MSG_IS_ENCRYPTED(compose->replyinfo->flags)) {
compose_force_encryption(compose, account, FALSE);
}
compose_set_title(compose);
compose->updating = FALSE;
+ compose->draft_timeout_tag = -1; /* desinhibit auto-drafting after loading */
if (compose->deferred_destroy) {
compose_destroy(compose);
return NULL;
}
-
+ END_TIMING();
return compose;
}
(msginfo)))
account = cur_account;
- compose = compose_create(account, COMPOSE_FORWARD, batch);
+ compose = compose_create(account, msginfo->folder, COMPOSE_FORWARD, batch);
compose->updating = TRUE;
compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);
if (as_attach) {
gchar *msgfile;
- msgfile = procmsg_get_message_file_path(msginfo);
+ msgfile = procmsg_get_message_file(msginfo);
if (!is_file_exist(msgfile))
g_warning("%s: file not exist\n", msgfile);
else
g_free(msgfile);
} else {
- gchar *qmark;
+ const gchar *qmark = NULL;
+ const gchar *body_fmt = prefs_common.fw_quotefmt;
MsgInfo *full_msginfo;
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
if (!full_msginfo)
full_msginfo = procmsg_msginfo_copy(msginfo);
- if (prefs_common.fw_quotemark &&
- *prefs_common.fw_quotemark)
+ /* use the forward format of folder (if enabled), or the account's one
+ (if enabled) or fallback to the global forward format, which is always
+ enabled (even if empty), and use the relevant quotemark */
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs->forward_with_format) {
+ qmark = msginfo->folder->prefs->forward_quotemark;
+ body_fmt = msginfo->folder->prefs->forward_body_format;
+
+ } else if (account->forward_with_format) {
+ qmark = account->forward_quotemark;
+ body_fmt = account->forward_body_format;
+
+ } else {
qmark = prefs_common.fw_quotemark;
- else
+ body_fmt = prefs_common.fw_quotefmt;
+ }
+
+ /* empty quotemark is not allowed */
+ if (qmark == NULL || *qmark == '\0')
qmark = "> ";
compose_quote_fmt(compose, full_msginfo,
- prefs_common.fw_quotefmt,
- qmark, body, FALSE);
+ body_fmt, qmark, body, FALSE, TRUE,
+ _("Message forward format error at line %d."));
quote_fmt_reset_vartable();
compose_attach_parts(compose, msginfo);
compose_set_title(compose);
compose->updating = FALSE;
+ compose->draft_timeout_tag = -1; /* desinhibit auto-drafting after loading */
if (compose->deferred_destroy) {
compose_destroy(compose);
#undef INSERT_FW_HEADER
-Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
+static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
{
Compose *compose;
GtkTextView *textview;
MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
}
- compose = compose_create(account, COMPOSE_FORWARD, FALSE);
+ compose = compose_create(account, ((MsgInfo *)msginfo_list->data)->folder, COMPOSE_FORWARD, FALSE);
compose->updating = TRUE;
undo_block(compose->undostruct);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
- msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
+ msgfile = procmsg_get_message_file((MsgInfo *)msginfo->data);
if (!is_file_exist(msgfile))
g_warning("%s: file not exist\n", msgfile);
compose_set_title(compose);
compose->updating = FALSE;
+ compose->draft_timeout_tag = -1; /* desinhibit auto-drafting after loading */
if (compose->deferred_destroy) {
compose_destroy(compose);
}
}
+#define BLOCK_WRAP() { \
+ prev_autowrap = compose->autowrap; \
+ buffer = gtk_text_view_get_buffer( \
+ GTK_TEXT_VIEW(compose->text)); \
+ compose->autowrap = FALSE; \
+ \
+ g_signal_handlers_block_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(compose_changed_cb), \
+ compose); \
+ g_signal_handlers_block_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(text_inserted), \
+ compose); \
+}
+#define UNBLOCK_WRAP() { \
+ compose->autowrap = prev_autowrap; \
+ if (compose->autowrap) { \
+ gint old = compose->draft_timeout_tag; \
+ compose->draft_timeout_tag = -2; \
+ compose_wrap_all(compose); \
+ compose->draft_timeout_tag = old; \
+ } \
+ \
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(compose_changed_cb), \
+ compose); \
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(text_inserted), \
+ compose); \
+}
+
Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
{
Compose *compose = NULL;
gint id, param;
/* Select Account from queue headers */
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Account-Id:")) {
+ id = atoi(&queueheader_buf[strlen("X-Claws-Account-Id:")]);
+ account = account_find_from_id(id);
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Account-Id:")) {
id = atoi(&queueheader_buf[strlen("X-Sylpheed-Account-Id:")]);
sizeof(queueheader_buf), "S:")) {
account = account_find_from_address(queueheader_buf);
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Sign:")) {
+ param = atoi(&queueheader_buf[strlen("X-Claws-Sign:")]);
+ use_signing = param;
+
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Sign:")) {
param = atoi(&queueheader_buf[strlen("X-Sylpheed-Sign:")]);
use_signing = param;
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Encrypt:")) {
+ param = atoi(&queueheader_buf[strlen("X-Claws-Encrypt:")]);
+ use_encryption = param;
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Encrypt:")) {
param = atoi(&queueheader_buf[strlen("X-Sylpheed-Encrypt:")]);
use_encryption = param;
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Privacy-System:")) {
+ privacy_system = g_strdup(&queueheader_buf[strlen("X-Claws-Privacy-System:")]);
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Privacy-System:")) {
privacy_system = g_strdup(&queueheader_buf[strlen("X-Sylpheed-Privacy-System:")]);
}
g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_REEDIT, batch);
+ compose = compose_create(account, msginfo->folder, COMPOSE_REEDIT, batch);
compose->replyinfo = replyinfo;
compose->fwdinfo = fwdinfo;
G_CALLBACK(compose_changed_cb),
compose);
- if (procmime_msginfo_is_encrypted(msginfo)) {
+ if (MSG_IS_ENCRYPTED(msginfo->flags)) {
fp = procmime_get_first_encrypted_text_content(msginfo);
if (fp) {
compose_force_encryption(compose, account, TRUE);
if (fp != NULL) {
gboolean prev_autowrap = compose->autowrap;
-
- compose->autowrap = FALSE;
+ GtkTextBuffer *buffer = textbuf;
+ BLOCK_WRAP();
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
gtk_text_buffer_insert(textbuf, &iter, buf, -1);
}
- compose_wrap_all_full(compose, FALSE);
- compose->autowrap = prev_autowrap;
+ UNBLOCK_WRAP();
fclose(fp);
}
compose_set_title(compose);
compose->updating = FALSE;
+ compose->draft_timeout_tag = -1; /* desinhibit auto-drafting after loading */
if (compose->deferred_destroy) {
compose_destroy(compose);
prefs_common.reply_account_autosel);
g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_REDIRECT, batch);
+ compose = compose_create(account, msginfo->folder, COMPOSE_REDIRECT, batch);
compose->updating = TRUE;
gtk_widget_grab_focus(compose->header_last->entry);
- filename = procmsg_get_message_file_path(msginfo);
+ filename = procmsg_get_message_file(msginfo);
if (filename == NULL) {
compose->updating = FALSE;
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 at line %d."));
quote_fmt_reset_vartable();
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
compose->modified = FALSE;
compose_set_title(compose);
compose->updating = FALSE;
+ compose->draft_timeout_tag = -1; /* desinhibit auto-drafting after loading */
if (compose->deferred_destroy) {
compose_destroy(compose);
void compose_entry_append(Compose *compose, const gchar *address,
ComposeEntryType type)
{
- gchar *header;
+ const gchar *header;
gchar *cur, *begin;
gboolean in_quote = FALSE;
if (!address || *address == '\0') return;
header = N_("To:");
break;
}
- header = prefs_common.trans_hdr ? gettext(header) : header;
+ header = prefs_common_translated_header_name(header);
cur = begin = (gchar *)address;
}
}
-void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
+static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
static GdkColor yellow;
static GdkColor black;
gchar *subject = NULL;
gchar *body = NULL;
gchar *temp = NULL;
- guint len = 0;
-
- scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body);
+ gsize 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);
+#ifdef USE_ASPELL
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
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++;
+
+#ifdef USE_ASPELL
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account);
+#endif
+ 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."));
+ gint line = quote_fmt_get_line();
+ alertpanel_error(err_msg, line);
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,
msginfo->from ? msginfo->from : "",
COMPOSE_TO);
else if (!to_all && !to_sender) {
- /* reply to the last list of recipients */
- compose_entry_append(compose,
- msginfo->to ? msginfo->to : "",
- COMPOSE_TO);
- compose_entry_append(compose,
- msginfo->cc ? msginfo->cc : "",
- COMPOSE_CC);
+ if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
+ !folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
+ !folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
+ compose_entry_append(compose,
+ msginfo->from ? msginfo->from : "",
+ COMPOSE_TO);
+ } else {
+ /* replying to own mail, use original recp */
+ compose_entry_append(compose,
+ msginfo->to ? msginfo->to : "",
+ COMPOSE_TO);
+ compose_entry_append(compose,
+ msginfo->cc ? msginfo->cc : "",
+ COMPOSE_CC);
+ }
}
}
} else {
to_table = g_hash_table_new(g_str_hash, g_str_equal);
if (replyto)
- g_hash_table_insert(to_table, g_strdup(replyto), GINT_TO_POINTER(1));
- if (compose->account)
- g_hash_table_insert(to_table, g_strdup(compose->account->address),
+ g_hash_table_insert(to_table, g_utf8_strdown(replyto, -1), GINT_TO_POINTER(1));
+ if (compose->account) {
+ g_hash_table_insert(to_table, g_utf8_strdown(compose->account->address, -1),
GINT_TO_POINTER(1));
-
+ }
/* remove address on To: and that of current account */
for (cur = cc_list; cur != NULL; ) {
GSList *next = cur->next;
gchar *addr;
- addr = g_strdup(cur->data);
+ addr = g_utf8_strdown(cur->data, -1);
extract_address(addr);
if (GPOINTER_TO_INT(g_hash_table_lookup(to_table, addr)) == 1)
GtkTextMark *mark;
GtkTextIter iter, iter_end;
gint cur_pos;
- gchar *search = NULL;
gboolean prev_autowrap;
- gboolean found = FALSE, shift = FALSE;
-
+ gboolean found = FALSE;
+ gboolean exists = FALSE;
g_return_if_fail(compose->account != NULL);
- prev_autowrap = compose->autowrap;
- compose->autowrap = FALSE;
+ BLOCK_WRAP();
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(compose_changed_cb),
gtk_text_buffer_get_end_iter(buffer, &iter);
- search = compose->sig_str;
-again:
- if (replace && search) {
+ exists = (compose->sig_str != NULL);
+
+ if (replace) {
GtkTextIter first_iter, start_iter, end_iter;
gtk_text_buffer_get_start_iter(buffer, &first_iter);
- if (compose->sig_str[0] == '\0')
+ if (!exists || compose->sig_str[0] == '\0')
found = FALSE;
else
- found = gtk_text_iter_forward_search(&first_iter,
- search,
- GTK_TEXT_SEARCH_TEXT_ONLY,
- &start_iter, &end_iter,
- NULL);
+ found = gtk_text_iter_forward_to_tag_toggle(&first_iter,
+ compose->signature_tag);
if (found) {
- gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
- iter = start_iter;
- }
+ /* include previous \n\n */
+ gtk_text_iter_backward_chars(&first_iter, 2);
+ start_iter = first_iter;
+ end_iter = first_iter;
+ /* skip re-start */
+ found = gtk_text_iter_forward_to_tag_toggle(&end_iter,
+ compose->signature_tag);
+ found &= gtk_text_iter_forward_to_tag_toggle(&end_iter,
+ compose->signature_tag);
+ if (found) {
+ 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 = compose_get_signature_str(compose);
- if (!compose->sig_str || (replace && !compose->account->auto_sig))
- compose->sig_str = g_strdup("");
cur_pos = gtk_text_iter_get_offset(&iter);
- 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);
- gtk_text_iter_forward_char(&iter);
- gtk_text_buffer_get_end_iter(buffer, &iter_end);
- gtk_text_buffer_apply_tag_by_name(buffer,"signature",&iter, &iter_end);
- if (cur_pos > gtk_text_buffer_get_char_count (buffer))
- cur_pos = gtk_text_buffer_get_char_count (buffer);
+ if (!compose->sig_str || (replace && !compose->account->auto_sig)) {
+ g_free(compose->sig_str);
+ compose->sig_str = NULL;
+ } else {
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+ /* remove \n\n */
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
+ gtk_text_iter_forward_chars(&iter, 2);
+ gtk_text_buffer_get_end_iter(buffer, &iter_end);
+ gtk_text_buffer_apply_tag_by_name(buffer,"signature",&iter, &iter_end);
+ if (cur_pos > gtk_text_buffer_get_char_count (buffer))
+ cur_pos = gtk_text_buffer_get_char_count (buffer);
+ }
/* put the cursor where it should be
* either where the quote_fmt says, either before the signature */
if (compose->set_cursor_pos < 0)
G_CALLBACK(compose_changed_cb),
compose);
- compose->autowrap = prev_autowrap;
- if (compose->autowrap)
- compose_wrap_all(compose);
+ UNBLOCK_WRAP();
}
static gchar *compose_get_signature_str(Compose *compose)
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;
+ gchar *file_from_uri = g_filename_from_uri(file, NULL, NULL);
+ gboolean result = FALSE;
+ if (file_from_uri && is_file_exist(file_from_uri)) {
+ result = compose_attach_append(
+ compose, file_from_uri,
+ filename,
+ content_type);
+ }
+ g_free(file_from_uri);
+ if (result)
+ return TRUE;
+ 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)
child = (MimeInfo *) mimeinfo->node->children->data;
while (child != NULL) {
+ gint err;
+
if (child == encrypted) {
/* skip this part of tree */
NEXT_PART_NOT_CHILD(child);
}
outfile = procmime_get_tmp_file_name(child);
- if (procmime_get_part(outfile, child) < 0)
- g_warning("Can't get the part of multipart message.");
+ if ((err = procmime_get_part(outfile, child)) < 0)
+ g_warning("Can't get the part of multipart message. (%s)", strerror(-err));
else {
gchar *content_type;
/* if we meet a pgp signature, we don't attach it, but
* we force signing. */
- if (strcmp(content_type, "application/pgp-signature")) {
+ if ((strcmp(content_type, "application/pgp-signature") &&
+ strcmp(content_type, "application/pkcs7-signature") &&
+ strcmp(content_type, "application/x-pkcs7-signature"))
+ || compose->mode == COMPOSE_REDIRECT) {
partname = procmime_mimeinfo_get_parameter(child, "filename");
if (partname == NULL)
partname = procmime_mimeinfo_get_parameter(child, "name");
gtk_text_iter_forward_to_line_end(&line_end);
str = gtk_text_buffer_get_text(buffer, &iter, &line_end, FALSE);
len = g_utf8_strlen(str, -1);
+
+ if (len == 0) {
+ g_free(str);
+ g_warning("compose_get_line_break_pos: len = 0!\n");
+ return FALSE;
+ }
+
/* g_print("breaking line: %d: %s (len = %d)\n",
gtk_text_iter_get_line(&iter), str, len); */
+
attrs = g_new(PangoLogAttr, len + 1);
pango_default_break(str, -1, NULL, attrs, len + 1);
g_warning("alloc error scanning URIs\n"); \
}
-static gboolean automatic_break = FALSE;
-static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
+static gboolean compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer;
gint nouri_start = -1, nouri_stop = -1;
gint num_blocks = 0;
gint quotelevel = -1;
+ gboolean modified = force;
+ gboolean removed = FALSE;
+ gboolean modified_before_remove = FALSE;
+ gint lines = 0;
+ gboolean start = TRUE;
+
+ if (force) {
+ modified = TRUE;
+ }
+ if (compose->draft_timeout_tag == -2) {
+ modified = TRUE;
+ }
compose->autowrap = FALSE;
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
}
- /* move to paragraph start */
- gtk_text_iter_set_line_offset(&iter, 0);
- if (gtk_text_iter_ends_line(&iter)) {
- while (gtk_text_iter_ends_line(&iter) &&
- gtk_text_iter_forward_line(&iter))
- ;
- } else {
- while (gtk_text_iter_backward_line(&iter)) {
- if (gtk_text_iter_ends_line(&iter)) {
- gtk_text_iter_forward_line(&iter);
- break;
+
+ if (compose->draft_timeout_tag == -2) {
+ if (gtk_text_iter_ends_line(&iter)) {
+ while (gtk_text_iter_ends_line(&iter) &&
+ gtk_text_iter_forward_line(&iter))
+ ;
+ } else {
+ while (gtk_text_iter_backward_line(&iter)) {
+ if (gtk_text_iter_ends_line(&iter)) {
+ gtk_text_iter_forward_line(&iter);
+ break;
+ }
}
}
+ } else {
+ /* move to line start */
+ gtk_text_iter_set_line_offset(&iter, 0);
}
-
/* go until paragraph end (empty line) */
-
- while (!gtk_text_iter_ends_line(&iter)) {
+ while (start || !gtk_text_iter_ends_line(&iter)) {
gchar *scanpos = NULL;
/* parse table - in order of priority */
struct table {
gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
gint walk_pos;
+ start = FALSE;
if (!prev_autowrap && num_blocks == 0) {
num_blocks++;
g_signal_handlers_block_by_func(G_OBJECT(buffer),
quote_str = compose_get_quote_str(buffer, &iter, "e_len);
if (quote_str) {
- if (!wrap_quote) {
- if (startq_offset == -1) {
- startq_offset = gtk_text_iter_get_offset(&iter);
- }
- goto colorize;
- }
debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
if (startq_offset == -1)
startq_offset = gtk_text_iter_get_offset(&iter);
else
quotelevel = 2;
}
+ if (!wrap_quote) {
+ goto colorize;
+ }
} else {
if (startq_offset == -1)
noq_offset = gtk_text_iter_get_offset(&iter);
if (prev_autowrap == FALSE && !force && !wrap_quote) {
goto colorize;
}
- if (compose_get_line_break_pos(buffer, &iter, &break_pos,
+ if (gtk_text_iter_ends_line(&iter)) {
+ goto colorize;
+ } else if (compose_get_line_break_pos(buffer, &iter, &break_pos,
prefs_common.linewrap_len,
quote_len)) {
GtkTextIter prev, next, cur;
-
+
if (prev_autowrap != FALSE || force) {
- automatic_break = TRUE;
+ compose->automatic_break = TRUE;
+ modified = TRUE;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
- automatic_break = FALSE;
+ compose->automatic_break = FALSE;
} else if (quote_str && wrap_quote) {
- automatic_break = TRUE;
+ compose->automatic_break = TRUE;
+ modified = TRUE;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
- automatic_break = FALSE;
+ compose->automatic_break = FALSE;
} else
goto colorize;
/* remove trailing spaces */
quote_str, -1);
iter = break_pos;
- compose_join_next_line(compose, buffer, &iter, quote_str);
+ modified |= compose_join_next_line(compose, buffer, &iter, quote_str);
/* move iter to current line start */
gtk_text_iter_set_line_offset(&iter, 0);
g_free(quote_str);
quote_str = NULL;
}
- continue;
+ continue;
} else {
/* move iter to next line start */
iter = break_pos;
+ lines++;
}
colorize:
gtk_text_buffer_get_iter_at_offset(
buffer, &startquote, startq_offset);
endquote = iter;
+
switch (quotelevel) {
- case 0: gtk_text_buffer_apply_tag_by_name(
- buffer, "quote0", &startquote, &endquote);
+ case 0:
+ if (!gtk_text_iter_has_tag(&startquote, compose->quote0_tag) ||
+ !gtk_text_iter_has_tag(&end_of_line, compose->quote0_tag)) {
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote0", &startquote, &endquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote1", &startquote, &endquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote2", &startquote, &endquote);
+ modified = TRUE;
+ }
break;
- case 1: gtk_text_buffer_apply_tag_by_name(
- buffer, "quote1", &startquote, &endquote);
+ case 1:
+ if (!gtk_text_iter_has_tag(&startquote, compose->quote1_tag) ||
+ !gtk_text_iter_has_tag(&end_of_line, compose->quote1_tag)) {
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote1", &startquote, &endquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote0", &startquote, &endquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote2", &startquote, &endquote);
+ modified = TRUE;
+ }
break;
- case 2: gtk_text_buffer_apply_tag_by_name(
- buffer, "quote2", &startquote, &endquote);
+ case 2:
+ if (!gtk_text_iter_has_tag(&startquote, compose->quote2_tag) ||
+ !gtk_text_iter_has_tag(&end_of_line, compose->quote2_tag)) {
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote2", &startquote, &endquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote0", &startquote, &endquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote1", &startquote, &endquote);
+ modified = TRUE;
+ }
break;
}
startq_offset = -1;
gtk_text_buffer_get_iter_at_offset(
buffer, &startnoquote, noq_offset);
endnoquote = iter;
- gtk_text_buffer_remove_tag_by_name(
- buffer, "quote0", &startnoquote, &endnoquote);
- gtk_text_buffer_remove_tag_by_name(
- buffer, "quote1", &startnoquote, &endnoquote);
- gtk_text_buffer_remove_tag_by_name(
- buffer, "quote2", &startnoquote, &endnoquote);
+
+ if ((gtk_text_iter_has_tag(&startnoquote, compose->quote0_tag)
+ && gtk_text_iter_has_tag(&end_of_line, compose->quote0_tag)) ||
+ (gtk_text_iter_has_tag(&startnoquote, compose->quote1_tag)
+ && gtk_text_iter_has_tag(&end_of_line, compose->quote1_tag)) ||
+ (gtk_text_iter_has_tag(&startnoquote, compose->quote2_tag)
+ && gtk_text_iter_has_tag(&end_of_line, compose->quote2_tag))) {
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote0", &startnoquote, &endnoquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote1", &startnoquote, &endnoquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote2", &startnoquote, &endnoquote);
+ modified = TRUE;
+ }
noq_offset = -1;
}
- /* always */ {
+ if (uri_start != nouri_start && uri_stop != nouri_stop) {
GtkTextIter nouri_start_iter, nouri_end_iter;
gtk_text_buffer_get_iter_at_offset(
buffer, &nouri_start_iter, nouri_start);
gtk_text_buffer_get_iter_at_offset(
buffer, &nouri_end_iter, nouri_stop);
- gtk_text_buffer_remove_tag_by_name(
- buffer, "link", &nouri_start_iter, &nouri_end_iter);
+ if (gtk_text_iter_has_tag(&nouri_start_iter, compose->uri_tag) &&
+ gtk_text_iter_has_tag(&nouri_end_iter, compose->uri_tag)) {
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "link", &nouri_start_iter, &nouri_end_iter);
+ modified_before_remove = modified;
+ modified = TRUE;
+ removed = TRUE;
+ }
}
if (uri_start > 0 && uri_stop > 0) {
- GtkTextIter uri_start_iter, uri_end_iter;
+ GtkTextIter uri_start_iter, uri_end_iter, back;
gtk_text_buffer_get_iter_at_offset(
buffer, &uri_start_iter, uri_start);
gtk_text_buffer_get_iter_at_offset(
buffer, &uri_end_iter, uri_stop);
- gtk_text_buffer_apply_tag_by_name(
- buffer, "link", &uri_start_iter, &uri_end_iter);
+ back = uri_end_iter;
+ gtk_text_iter_backward_char(&back);
+ if (!gtk_text_iter_has_tag(&uri_start_iter, compose->uri_tag) ||
+ !gtk_text_iter_has_tag(&back, compose->uri_tag)) {
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "link", &uri_start_iter, &uri_end_iter);
+ modified = TRUE;
+ if (removed && !modified_before_remove) {
+ modified = FALSE;
+ }
+ }
+ }
+ if (!modified) {
+ debug_print("not modified, out after %d lines\n", lines);
+ goto end;
}
}
+ debug_print("modified, out after %d lines\n", lines);
+end:
if (par_iter)
*par_iter = iter;
undo_wrapping(compose->undostruct, FALSE);
compose->autowrap = prev_autowrap;
+
+ return modified;
}
void compose_action_cb(void *data)
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer;
GtkTextIter iter;
+ gboolean modified = TRUE;
buffer = gtk_text_view_get_buffer(text);
gtk_text_buffer_get_start_iter(buffer, &iter);
- while (!gtk_text_iter_is_end(&iter))
- compose_beautify_paragraph(compose, &iter, force);
+ while (!gtk_text_iter_is_end(&iter) && modified)
+ modified = compose_beautify_paragraph(compose, &iter, force);
}
subject = gtk_editable_get_chars(
GTK_EDITABLE(compose->subject_entry), 0, -1);
+#ifndef MAEMO
if (subject && strlen(subject))
str = g_strdup_printf(_("%s - Compose message%s"),
subject, edited);
else
str = g_strdup_printf(_("[no subject] - Compose message%s"), edited);
+#else
+ str = g_strdup(_("Compose message"));
+#endif
+
gtk_window_set_title(GTK_WINDOW(compose->window), str);
g_free(str);
g_free(subject);
compose_insert_sig(compose, TRUE);
undo_unblock(compose->undostruct);
}
+
+#ifdef USE_ASPELL
+ /* use account's dict info if set */
+ if (compose->gtkaspell) {
+ if (account->enable_default_dictionary)
+ gtkaspell_change_dict(compose->gtkaspell,
+ account->default_dictionary, FALSE);
+ if (account->enable_default_alt_dictionary)
+ gtkaspell_change_alt_dict(compose->gtkaspell,
+ account->default_alt_dictionary);
+ if (account->enable_default_dictionary
+ || account->enable_default_alt_dictionary)
+ compose_spell_menu_changed(compose);
+ }
+#endif
}
gboolean compose_check_for_valid_recipient(Compose *compose) {
gchar *entry;
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
+
g_strstrip(entry);
if (entry[0] != '\0') {
for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
- if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ if (!strcmp(header, prefs_common_translated_header_name(*strptr))) {
compose->to_list = address_list_append(compose->to_list, entry);
recipient_found = TRUE;
}
}
for (strptr = recipient_headers_news; *strptr != NULL; strptr++) {
- if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ if (!strcmp(header, prefs_common_translated_header_name(*strptr))) {
compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
recipient_found = TRUE;
}
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)
- || strcmp(header, (prefs_common.trans_hdr ? gettext("Cc:") : "Cc:"))) {
+ || strcmp(header, prefs_common_translated_header_name("Cc:"))) {
found_other = TRUE;
g_free(entry);
break;
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_bcc)
- || strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
+ || strcmp(header, prefs_common_translated_header_name("Bcc:"))) {
found_other = TRUE;
g_free(entry);
break;
return TRUE;
}
-static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
+static gboolean compose_check_entries(Compose *compose, gboolean check_everything)
{
const gchar *str;
if (!compose->batch) {
str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str == '\0' && check_subject == TRUE) {
+ if (*str == '\0' && check_everything == TRUE &&
+ compose->mode != COMPOSE_REDIRECT) {
AlertValue aval;
+ gchar *button_label;
+ gchar *message;
- aval = alertpanel(_("Send"),
- _("Subject is empty. Send it anyway?"),
- GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (compose->sending)
+ button_label = _("+_Send");
+ else
+ button_label = _("+_Queue");
+ message = g_strdup_printf(_("Subject is empty. %s it anyway?"),
+ compose->sending?_("Send"):_("Queue"));
+
+ aval = alertpanel(compose->sending?_("Send"):_("Send later"), message,
+ GTK_STOCK_CANCEL, button_label, NULL);
+ g_free(message);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
}
+ if (check_everything && hooks_invoke(COMPOSE_CHECK_BEFORE_SEND_HOOKLIST, compose))
+ return FALSE;
+
return TRUE;
}
gchar *msgpath = NULL;
gboolean discard_window = FALSE;
gchar *errstr = NULL;
+ gchar *tmsgid = NULL;
MainWindow *mainwin = mainwindow_get_mainwindow();
+ gboolean queued_removed = FALSE;
- if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
+ if (prefs_common.send_dialog_invisible
|| compose->batch == TRUE)
discard_window = TRUE;
} else if (val == -5) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Couldn't get recipient encryption key."));
+ } else if (val == -6) {
+ /* silent error */
} else if (val == -3) {
if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
goto bail;
}
+ tmsgid = g_strdup(compose->msgid);
if (discard_window) {
compose->sending = FALSE;
compose_close(compose);
goto bail;
}
inc_unlock();
+ g_free(tmsgid);
return -1;
}
if (msgpath == NULL) {
msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum, &queued_removed);
g_free(msgpath);
} else {
- val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum, &queued_removed);
g_unlink(msgpath);
g_free(msgpath);
}
if (!discard_window) {
- compose->sending = FALSE;
- compose_allow_user_actions (compose, TRUE);
if (val != 0) {
- folder_item_remove_msg(folder, msgnum);
+ if (!queued_removed)
+ 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);
+ if (!queued_removed)
+ folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
- if (!discard_window)
+ 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->sending = FALSE;
+ compose_allow_user_actions (compose, TRUE);
compose_close(compose);
+ }
} else {
if (errstr) {
- gchar *tmp = g_strdup_printf(_("%s\nUse \"Send queued messages\" from "
+ alertpanel_error_log(_("%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 "
goto bail;
}
inc_unlock();
+ g_free(tmsgid);
return -1;
}
+ g_free(tmsgid);
inc_unlock();
toolbar_main_set_sensitive(mainwin);
main_window_set_menu_sensitive(mainwin);
bail:
inc_unlock();
+ g_free(tmsgid);
compose_allow_user_actions (compose, TRUE);
compose->sending = FALSE;
compose->modified = TRUE;
GSList *list;
ComposeHeaderEntry *headerentry;
const gchar *headerentryname;
- gchar *cc_hdr;
- gchar *to_hdr;
+ const gchar *cc_hdr;
+ const gchar *to_hdr;
debug_print("Writing redirect header\n");
- cc_hdr = prefs_common.trans_hdr ? _("Cc:") : "Cc:";
- to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
+ cc_hdr = prefs_common_translated_header_name("Cc:");
+ to_hdr = prefs_common_translated_header_name("To:");
first_to_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
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-Claws-Privacy", "X-Claws-Sign:", "X-Claws-Encrypt",
+ "X-Claws-End-Special-Headers:", "X-Claws-Account-Id:",
+ "X-Sylpheed-Privacy", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt",
+ "X-Sylpheed-End-Special-Headers:", "X-Sylpheed-Account-Id:",
+ 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;
if (folder_item_remove_msg(item, msginfo->msgnum) < 0) {
g_warning("can't remove the old message\n");
return -1;
+ } else {
+ debug_print("removed reedit target %d\n", msginfo->msgnum);
}
}
return 0;
}
-void compose_remove_draft(Compose *compose)
+static void compose_remove_draft(Compose *compose)
{
FolderItem *drafts;
MsgInfo *msginfo = compose->targetinfo;
{
return compose_queue_sub (compose, msgnum, item, msgpath, FALSE, remove_reedit_target);
}
+
+static gboolean compose_warn_encryption(Compose *compose)
+{
+ const gchar *warning = privacy_get_encrypt_warning(compose->privacy_system);
+ AlertValue val = G_ALERTALTERNATE;
+
+ if (warning == NULL)
+ return TRUE;
+
+ val = alertpanel_full(_("Encryption warning"), warning,
+ GTK_STOCK_CANCEL, _("+C_ontinue"), NULL,
+ TRUE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
+ if (val & G_ALERTDISABLE) {
+ val &= ~G_ALERTDISABLE;
+ if (val == G_ALERTALTERNATE)
+ privacy_inhibit_encrypt_warning(compose->privacy_system,
+ TRUE);
+ }
+
+ if (val == G_ALERTALTERNATE) {
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+}
+
static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
gchar **msgpath, gboolean check_subject,
gboolean remove_reedit_target)
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-Claws-Privacy-System:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Claws-Sign:%d\n", compose->use_signing);
if (compose->use_encryption) {
gchar *encdata;
+ if (!compose_warn_encryption(compose)) {
+ lock = FALSE;
+ fclose(fp);
+ g_unlink(tmp);
+ g_free(tmp);
+ return -6;
+ }
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);
}
if (encdata != NULL) {
if (strcmp(encdata, "_DONT_ENCRYPT_")) {
- fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
- fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n",
+ fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Claws-Encrypt-Data:%s\n",
encdata);
} /* else we finally dont want to encrypt */
} else {
- fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
lock = FALSE;
}
/* end of headers */
- fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+ fprintf(fp, "X-Claws-End-Special-Headers: 1\n");
if (compose->redirect_filename != NULL) {
if (compose_redirect_write_to_file(compose, fp) < 0) {
!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) {
const gchar *fieldname,
const gchar *seperator)
{
- gchar *str, *fieldname_w_colon, *trans_fieldname;
+ gchar *str, *fieldname_w_colon;
gboolean add_field = FALSE;
GSList *list;
ComposeHeaderEntry *headerentry;
- const gchar * headerentryname;
+ const gchar *headerentryname;
+ const gchar *trans_fieldname;
GString *fieldstr;
if (IS_IN_CUSTOM_HEADER(fieldname))
fieldstr = g_string_sized_new(64);
fieldname_w_colon = g_strconcat(fieldname, ":", NULL);
- trans_fieldname = (prefs_common.trans_hdr ? gettext(fieldname_w_colon) : fieldname_w_colon);
+ trans_fieldname = prefs_common_translated_header_name(fieldname_w_colon);
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
gchar *tmp;
gchar *headername;
gchar *headername_wcolon;
- gchar *headername_trans;
+ const gchar *headername_trans;
gchar *headervalue;
gchar **string;
gboolean standard_header = FALSE;
subst_char(headervalue, '\n', ' ');
string = std_headers;
while (*string != NULL) {
- headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
- if (!strcmp(headername_trans,headername_wcolon))
+ headername_trans = prefs_common_translated_header_name(*string);
+ if (!strcmp(headername_trans, headername_wcolon))
standard_header = TRUE;
string++;
}
g_free(tmpstr);
}
+static void compose_add_to_addressbook_cb(GtkMenuItem *menuitem, gpointer user_data)
+{
+ gchar *address;
+
+ g_return_if_fail(user_data != NULL);
+
+ address = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_data)));
+ g_strstrip(address);
+ if (*address != '\0') {
+ gchar *name = procheader_get_fromname(address);
+ extract_address(address);
+ addressbook_add_contact(name, address, NULL);
+ }
+ g_free(address);
+}
+
+static void compose_entry_popup_extend(GtkEntry *entry, GtkMenu *menu, gpointer user_data)
+{
+ GtkWidget *menuitem;
+ gchar *address;
+
+ g_return_if_fail(menu != NULL);
+ g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+
+ menuitem = gtk_separator_menu_item_new();
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
+ gtk_widget_show(menuitem);
+
+ menuitem = gtk_menu_item_new_with_mnemonic(_("Add to address _book"));
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
+
+ address = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+ g_strstrip(address);
+ if (*address == '\0') {
+ gtk_widget_set_sensitive(GTK_WIDGET(menuitem), FALSE);
+ }
+
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(compose_add_to_addressbook_cb), entry);
+ gtk_widget_show(menuitem);
+}
+
static void compose_create_header_entry(Compose *compose)
{
gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
combo = gtk_combo_new();
string = headers;
while(*string != NULL) {
- combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
+ combo_list = g_list_append(combo_list, (gchar*)prefs_common_translated_header_name(*string));
string++;
}
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(combo);
- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
+ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1,
+ compose->header_nextrow, compose->header_nextrow+1,
+ GTK_SHRINK, GTK_FILL, 0, 0);
if (compose->header_last) {
- const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ const gchar *last_header_entry = gtk_entry_get_text(
+ GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
string = headers;
while (*string != NULL) {
if (!strcmp(*string, last_header_entry))
if (!compose->header_last || !standard_header) {
switch(compose->account->protocol) {
case A_NNTP:
- header = prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:";
+ header = prefs_common_translated_header_name("Newsgroups:");
break;
default:
- header = prefs_common.trans_hdr ? _("To:") : "To:";
+ header = prefs_common_translated_header_name("To:");
break;
}
}
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);
+ 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_headerentry_key_press_event_cb),
g_signal_connect(G_OBJECT(entry), "drag-drop",
G_CALLBACK(compose_drag_drop),
compose);
+ g_signal_connect(G_OBJECT(entry), "populate-popup",
+ G_CALLBACK(compose_entry_popup_extend),
+ NULL);
address_completion_register_entry(GTK_ENTRY(entry), TRUE);
headerentry->headernum = compose->header_nextrow;
compose->header_nextrow++;
- compose->header_last = headerentry;
+ compose->header_last = headerentry;
+ compose->header_list =
+ g_slist_append(compose->header_list,
+ headerentry);
}
-static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text)
+static void compose_add_header_entry(Compose *compose, const gchar *header, gchar *text)
{
ComposeHeaderEntry *last_header;
last_header = compose->header_last;
-
+
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(last_header->combo)->entry), header);
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);
+ }
+ compose->header_last = NULL;
+ g_slist_free(compose->header_list);
+ compose->header_list = NULL;
+ compose->header_nextrow = 1;
+ compose_create_header_entry(compose);
+}
+
static GtkWidget *compose_create_header(Compose *compose)
{
GtkWidget *from_optmenu_hbox;
return header_scrolledwin ;
}
-GtkWidget *compose_create_attach(Compose *compose)
+static gboolean popup_attach_button_pressed(GtkWidget *widget, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ GdkEventButton event;
+
+ event.button = 3;
+ event.time = gtk_get_current_event_time();
+
+ return attach_button_pressed(compose->attach_clist, &event, compose);
+}
+
+static GtkWidget *compose_create_attach(Compose *compose)
{
GtkWidget *attach_scrwin;
GtkWidget *attach_clist;
G_CALLBACK(attach_selected), compose);
g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
G_CALLBACK(attach_button_pressed), compose);
+#ifndef MAEMO
+ g_signal_connect(G_OBJECT(attach_clist), "popup-menu",
+ G_CALLBACK(popup_attach_button_pressed), compose);
+#else
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(attach_clist), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect(G_OBJECT(attach_clist), "tap-and-hold",
+ G_CALLBACK(popup_attach_button_pressed), compose);
+#endif
g_signal_connect(G_OBJECT(attach_clist), "key_press_event",
G_CALLBACK(attach_key_pressed), compose);
static void entry_paste_clipboard(Compose *compose, GtkWidget *entry, gboolean wrap,
GdkAtom clip, GtkTextIter *insert_place);
-#define BLOCK_WRAP() { \
- prev_autowrap = compose->autowrap; \
- buffer = gtk_text_view_get_buffer( \
- GTK_TEXT_VIEW(compose->text)); \
- compose->autowrap = FALSE; \
- \
- g_signal_handlers_block_by_func(G_OBJECT(buffer), \
- G_CALLBACK(compose_changed_cb), \
- compose); \
- g_signal_handlers_block_by_func(G_OBJECT(buffer), \
- G_CALLBACK(text_inserted), \
- compose); \
-}
-#define UNBLOCK_WRAP() { \
- compose->autowrap = prev_autowrap; \
- if (compose->autowrap) \
- compose_wrap_all(compose); \
- \
- g_signal_handlers_unblock_by_func(G_OBJECT(buffer), \
- G_CALLBACK(compose_changed_cb), \
- compose); \
- g_signal_handlers_unblock_by_func(G_OBJECT(buffer), \
- G_CALLBACK(text_inserted), \
- compose); \
-}
-
static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
Compose *compose)
}
#endif
+static gboolean compose_popup_menu(GtkWidget *widget, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ GdkEventButton event;
+
+ event.button = 3;
+ event.time = gtk_get_current_event_time();
+
+ return text_clicked(compose->text, &event, compose);
+}
+
static gboolean compose_force_window_origin = TRUE;
-static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
+static Compose *compose_create(PrefsAccount *account,
+ FolderItem *folder,
+ ComposeMode mode,
gboolean batch)
{
Compose *compose;
compose->batch = batch;
compose->account = account;
+ compose->folder = folder;
compose->mutex = g_mutex_new();
compose->set_cursor_pos = -1;
compose->tooltips = gtk_tooltips_new();
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
+
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);
-
+
+#ifndef MAEMO
if (compose_force_window_origin)
gtk_widget_set_uposition(window, prefs_common.compose_x,
prefs_common.compose_y);
-
+#endif
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(compose_delete_cb), compose);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
gtk_widget_realize(handlebox);
+#ifdef MAEMO
+ compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, window,
+ (gpointer)compose);
+#else
compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
(gpointer)compose);
+#endif
vbox2 = gtk_vbox_new(FALSE, 2);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
gtk_widget_show(subject_frame);
- subject = gtk_hbox_new(FALSE, 0);
+ subject = gtk_hbox_new(FALSE, HSPACING_NARROW);
gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
gtk_widget_show(subject);
G_CALLBACK(text_inserted), compose);
g_signal_connect(G_OBJECT(text), "button_press_event",
G_CALLBACK(text_clicked), compose);
+#ifndef MAEMO
+ g_signal_connect(G_OBJECT(text), "popup-menu",
+ G_CALLBACK(compose_popup_menu), compose);
+#else
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(text), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect(G_OBJECT(text), "tap-and-hold",
+ G_CALLBACK(compose_popup_menu), compose);
+#endif
g_signal_connect(G_OBJECT(subject_entry), "changed",
G_CALLBACK(compose_changed_cb), compose);
paned = gtk_vpaned_new();
gtk_paned_set_gutter_size(GTK_PANED(paned), 12);
gtk_container_add(GTK_CONTAINER(vbox2), paned);
+#ifdef MAEMO
+ if( maemo_mainwindow_is_fullscreen(mainwindow_get_mainwindow()->window) )
+ gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 300 : 280);
+ else
+ gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230);
+#endif
gtk_paned_add1(GTK_PANED(paned), notebook);
gtk_paned_add2(GTK_PANED(paned), edit_vbox);
gtk_widget_show_all(paned);
compose->paned = paned;
+ compose->notebook = notebook;
compose->edit_vbox = edit_vbox;
compose->ruler_hbox = ruler_hbox;
compose->ruler = ruler;
compose->tmpl_menu = tmpl_menu;
compose->mode = mode;
+ compose->rmode = mode;
compose->targetinfo = NULL;
compose->replyinfo = NULL;
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
compose->exteditor_tag = -1;
- compose->draft_timeout_tag = -1;
+ compose->draft_timeout_tag = -2; /* inhibit auto-drafting while loading */
#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", FALSE);
strcmp(prefs_common.dictionary, "")) {
gtkaspell = gtkaspell_new(prefs_common.aspell_path,
prefs_common.dictionary,
+ prefs_common.alt_dictionary,
conv_get_locale_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.recheck_when_changing_dict,
prefs_common.use_alternate,
+ prefs_common.use_both_dicts,
GTK_TEXT_VIEW(text),
GTK_WINDOW(compose->window),
compose_spell_menu_changed,
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:");
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry),
+ prefs_common_translated_header_name("To:"));
else
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry),
+ prefs_common_translated_header_name("Newsgroups:"));
addressbook_set_target_compose(compose);
gtk_widget_realize(window);
} else {
gtk_widget_show(window);
+#ifdef MAEMO
+ maemo_window_full_screen_if_needed(GTK_WINDOW(window));
+ maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
+#endif
}
return compose;
g_signal_connect(G_OBJECT(optmenu), "changed",
G_CALLBACK(account_activated),
compose);
+ g_signal_connect(G_OBJECT(from_name), "populate-popup",
+ G_CALLBACK(compose_entry_popup_extend),
+ NULL);
gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
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;
+
+ 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);
+ if (compose->account->set_autocc && compose->account->auto_cc)
+ compose_entry_append(compose, compose->account->auto_cc, COMPOSE_CC);
+
+ if (compose->account->set_autobcc && compose->account->auto_bcc)
+ compose_entry_append(compose, compose->account->auto_bcc, COMPOSE_BCC);
+
+ if (compose->account->set_autoreplyto && compose->account->auto_replyto)
+ compose_entry_append(compose, compose->account->auto_replyto, COMPOSE_REPLYTO);
+ 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;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
if (warn && !found && strlen(compose->privacy_system)) {
- gchar *tmp = g_strdup_printf(
- _("The privacy system '%s' cannot be loaded. You "
+ alertpanel_warning(_("The privacy system '%s' cannot be loaded. You "
"will not be able to sign or encrypt this message."),
compose->privacy_system);
- alertpanel_warning(tmp);
- g_free(tmp);
}
}
action_update_compose_menu(ifactory, "/Tools/Actions", compose);
}
-void compose_update_privacy_systems_menu(Compose *compose)
+static void compose_update_privacy_systems_menu(Compose *compose)
{
static gchar *branch_path = "/Options/Privacy System";
GtkItemFactory *ifactory;
}
}
+static const gchar *compose_quote_char_from_context(Compose *compose)
+{
+ const gchar *qmark = NULL;
+
+ g_return_val_if_fail(compose != NULL, NULL);
+
+ switch (compose->mode) {
+ /* use forward-specific quote char */
+ case COMPOSE_FORWARD:
+ case COMPOSE_FORWARD_AS_ATTACH:
+ case COMPOSE_FORWARD_INLINE:
+ if (compose->folder && compose->folder->prefs &&
+ compose->folder->prefs->forward_with_format)
+ qmark = compose->folder->prefs->forward_quotemark;
+ else if (compose->account->forward_with_format)
+ qmark = compose->account->forward_quotemark;
+ else
+ qmark = prefs_common.fw_quotemark;
+ break;
+
+ /* use reply-specific quote char in all other modes */
+ default:
+ if (compose->folder && compose->folder->prefs &&
+ compose->folder->prefs->reply_with_format)
+ qmark = compose->folder->prefs->reply_quotemark;
+ else if (compose->account->reply_with_format)
+ qmark = compose->account->reply_quotemark;
+ else
+ qmark = prefs_common.quotemark;
+ break;
+ }
+
+ if (qmark == NULL || *qmark == '\0')
+ qmark = "> ";
+
+ return qmark;
+}
+
static void compose_template_apply(Compose *compose, Template *tmpl,
gboolean replace)
{
GtkTextBuffer *buffer;
GtkTextMark *mark;
GtkTextIter iter;
- gchar *qmark;
+ const gchar *qmark;
gchar *parsed_str = NULL;
gint cursor_pos = 0;
+ const gchar *err_msg = _("Template body format error at line %d.");
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) {
+ qmark = compose_quote_char_from_context(compose);
- 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 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);
+#ifdef USE_ASPELL
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
quote_fmt_scan_string(tmpl->to);
quote_fmt_parse();
buf = quote_fmt_get_buffer();
if (buf == NULL) {
- alertpanel_error(_("Message To format error."));
+ alertpanel_error(_("Template To format error."));
} else {
compose_entry_append(compose, buf, COMPOSE_TO);
}
}
if (tmpl->cc && *tmpl->cc != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+#ifdef USE_ASPELL
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
quote_fmt_scan_string(tmpl->cc);
quote_fmt_parse();
buf = quote_fmt_get_buffer();
if (buf == NULL) {
- alertpanel_error(_("Message Cc format error."));
+ alertpanel_error(_("Template Cc format error."));
} else {
compose_entry_append(compose, buf, COMPOSE_CC);
}
}
if (tmpl->bcc && *tmpl->bcc != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+#ifdef USE_ASPELL
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
quote_fmt_scan_string(tmpl->bcc);
quote_fmt_parse();
buf = quote_fmt_get_buffer();
if (buf == NULL) {
- alertpanel_error(_("Message Bcc format error."));
+ alertpanel_error(_("Template Bcc format error."));
} else {
compose_entry_append(compose, buf, COMPOSE_BCC);
}
/* process the subject */
if (tmpl->subject && *tmpl->subject != '\0') {
- quote_fmt_init(msginfo, NULL, NULL, FALSE);
+#ifdef USE_ASPELL
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+#endif
quote_fmt_scan_string(tmpl->subject);
quote_fmt_parse();
buf = quote_fmt_get_buffer();
if (buf == NULL) {
- alertpanel_error(_("Message subject format error."));
+ alertpanel_error(_("Template subject format error."));
} else {
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
}
}
+
+ procmsg_msginfo_free( dummyinfo );
}
static void compose_destroy(Compose *compose)
debug_print("Creating attach_property window...\n");
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose_attach_property");
gtk_widget_set_size_request(window, 480, -1);
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
Compose *compose = (Compose *)data;
if (prefs_common.work_offline &&
- !inc_offline_should_override(
- _("Sylpheed-Claws needs network access in order "
+ !inc_offline_should_override(TRUE,
+ _("Claws Mail needs network access in order "
"to send this email.")))
return;
- if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
- gtk_timeout_remove(compose->draft_timeout_tag);
+ if (compose->draft_timeout_tag >= 0) { /* CLAWS: disable draft timeout */
+ g_source_remove(compose->draft_timeout_tag);
compose->draft_timeout_tag = -1;
}
} else if (val == -5) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Couldn't get recipient encryption key."));
+ } else if (val == -6) {
+ /* silent error */
}
toolbar_main_set_sensitive(mainwindow_get_mainwindow());
}
-void compose_draft (gpointer data)
+#define DRAFTED_AT_EXIT "drafted_at_exit"
+static void compose_register_draft(MsgInfo *info)
{
- compose_draft_cb(data, COMPOSE_QUIT_EDITING, NULL);
+ gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ DRAFTED_AT_EXIT, NULL);
+ FILE *fp = fopen(filepath, "ab");
+
+ if (fp) {
+ fprintf(fp, "%s\t%d\n", folder_item_get_identifier(info->folder),
+ info->msgnum);
+ fclose(fp);
+ }
+
+ g_free(filepath);
}
-static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
+gboolean compose_draft (gpointer data, guint action)
{
Compose *compose = (Compose *)data;
FolderItem *draft;
FILE *fp;
gboolean target_locked = FALSE;
- if (lock) return;
+ if (lock) return FALSE;
+
+ if (compose->sending)
+ return TRUE;
draft = account_get_special_folder(compose->account, F_DRAFT);
- g_return_if_fail(draft != NULL);
+ g_return_val_if_fail(draft != NULL, FALSE);
if (!g_mutex_trylock(compose->mutex)) {
/* we don't want to lock the mutex once it's available,
* it is compose_close - which means once unlocked,
* the compose struct will be freed */
debug_print("couldn't lock mutex, probably sending\n");
- return;
+ return FALSE;
}
lock = TRUE;
}
/* Save draft infos */
- fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
+ fprintf(fp, "X-Claws-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))) {
fprintf(fp, "RRCPT:1\n");
}
if (compose->privacy_system) {
- fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
- fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
- fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Claws-Sign:%d\n", compose->use_signing);
+ fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Claws-Privacy-System:%s\n", compose->privacy_system);
}
/* Message-ID of message replying to */
}
/* end of headers */
- fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+ fprintf(fp, "X-Claws-End-Special-Headers: 1\n");
if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE, action != COMPOSE_AUTO_SAVE) < 0) {
fclose(fp);
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
+ MsgInfo *tmpinfo = NULL;
+ debug_print("didn't get msgnum after adding draft [%s]\n", compose->msgid?compose->msgid:"no msgid");
+ if (compose->msgid) {
+ tmpinfo = folder_item_get_msginfo_by_msgid(draft, compose->msgid);
+ }
+ if (tmpinfo) {
+ msgnum = tmpinfo->msgnum;
+ procmsg_msginfo_free(tmpinfo);
+ debug_print("got draft msgnum %d from scanning\n", msgnum);
+ } else {
+ debug_print("didn't get draft msgnum after scanning\n");
+ }
+ } else {
+ debug_print("got draft msgnum %d from adding\n", msgnum);
+ }
+ if (msgnum < 0) {
g_unlink(tmp);
g_free(tmp);
- if (action != COMPOSE_AUTO_SAVE)
- alertpanel_error(_("Could not save draft."));
+ if (action != COMPOSE_AUTO_SAVE) {
+ if (action != COMPOSE_DRAFT_FOR_EXIT)
+ alertpanel_error(_("Could not save draft."));
+ else {
+ AlertValue val;
+ gtkut_window_popup(compose->window);
+ val = alertpanel_full(_("Could not save draft"),
+ _("Could not save draft.\n"
+ "Do you want to cancel exit or discard this email?"),
+ _("_Cancel exit"), _("_Discard email"), NULL,
+ FALSE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
+ if (val == G_ALERTALTERNATE) {
+ lock = FALSE;
+ g_mutex_unlock(compose->mutex); /* must be done before closing */
+ compose_close(compose);
+ return TRUE;
+ } else {
+ lock = FALSE;
+ g_mutex_unlock(compose->mutex); /* must be done before closing */
+ return FALSE;
+ }
+ }
+ }
goto unlock;
}
g_free(tmp);
}
newmsginfo = folder_item_get_msginfo(draft, msgnum);
+
if (newmsginfo) {
procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
if (target_locked)
procmsg_msginfo_set_flags(newmsginfo, 0,
MSG_HAS_ATTACHMENT);
+ if (action == COMPOSE_DRAFT_FOR_EXIT) {
+ compose_register_draft(newmsginfo);
+ }
procmsg_msginfo_free(newmsginfo);
}
folder_item_scan(draft);
- if (action == COMPOSE_QUIT_EDITING) {
+ if (action == COMPOSE_QUIT_EDITING || action == COMPOSE_DRAFT_FOR_EXIT) {
lock = FALSE;
g_mutex_unlock(compose->mutex); /* must be done before closing */
compose_close(compose);
- return;
+ return TRUE;
} else {
struct stat s;
gchar *path;
path = folder_item_fetch_msg(draft, msgnum);
if (path == NULL) {
- debug_print("can't fetch %s:%d\n",draft->path, msgnum);
+ debug_print("can't fetch %s:%d\n", draft->path, msgnum);
goto unlock;
}
if (g_stat(path, &s) < 0) {
unlock:
lock = FALSE;
g_mutex_unlock(compose->mutex);
+ return TRUE;
+}
+
+void compose_clear_exit_drafts(void)
+{
+ gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ DRAFTED_AT_EXIT, NULL);
+ if (is_file_exist(filepath))
+ g_unlink(filepath);
+
+ g_free(filepath);
+}
+
+void compose_reopen_exit_drafts(void)
+{
+ gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+ DRAFTED_AT_EXIT, NULL);
+ FILE *fp = fopen(filepath, "rb");
+ gchar buf[1024];
+
+ if (fp) {
+ while (fgets(buf, sizeof(buf), fp)) {
+ gchar **parts = g_strsplit(buf, "\t", 2);
+ const gchar *folder = parts[0];
+ int msgnum = parts[1] ? atoi(parts[1]):-1;
+
+ if (folder && *folder && msgnum > -1) {
+ FolderItem *item = folder_find_item_from_identifier(folder);
+ MsgInfo *info = folder_item_get_msginfo(item, msgnum);
+ if (info)
+ compose_reedit(info, FALSE);
+ }
+ g_strfreev(parts);
+ }
+ fclose(fp);
+ }
+ g_free(filepath);
+ compose_clear_exit_drafts();
+}
+
+static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
+{
+ compose_draft(data, action);
}
static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
return TRUE;
}
+void compose_close_toolbar(Compose *compose)
+{
+ compose_close_cb(compose, 0, NULL);
+}
+
static void compose_close_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
static void compose_cut_cb(Compose *compose)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_cut_clipboard(compose->focused_editable);
}
static void compose_copy_cb(Compose *compose)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_copy_clipboard(compose->focused_editable);
}
static void compose_paste_as_quote_cb(Compose *compose)
{
gint wrap_quote = prefs_common.linewrap_quote;
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable)) {
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ ) {
/* let text_insert() (called directly or at a later time
* after the gtk_editable_paste_clipboard) know that
* text is to be inserted as a quotation. implemented
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_paste_clipboard(compose, compose->focused_editable, FALSE,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_paste_clipboard(compose, compose->focused_editable, TRUE,
GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
static void compose_allsel_cb(Compose *compose)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ if (compose->focused_editable
+#ifndef MAEMO
+ && GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
+#endif
+ )
entry_allsel(compose->focused_editable);
}
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
+
+#ifdef MAEMO
+ if (GTK_IS_TEXT_VIEW(widget)
+ && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->edit_vbox) {
+ gtk_widget_ref(compose->notebook);
+ gtk_widget_ref(compose->edit_vbox);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
+ gtk_paned_add1(GTK_PANED(compose->paned), compose->edit_vbox);
+ gtk_paned_add2(GTK_PANED(compose->paned), compose->notebook);
+ gtk_widget_unref(compose->notebook);
+ gtk_widget_unref(compose->edit_vbox);
+ g_signal_handlers_block_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ gtk_widget_grab_focus(widget);
+ g_signal_handlers_unblock_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ } else if (!GTK_IS_TEXT_VIEW(widget)
+ && gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->notebook) {
+ gtk_widget_ref(compose->notebook);
+ gtk_widget_ref(compose->edit_vbox);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
+ gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
+ gtk_paned_add1(GTK_PANED(compose->paned), compose->notebook);
+ gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
+ gtk_widget_unref(compose->notebook);
+ gtk_widget_unref(compose->edit_vbox);
+ g_signal_handlers_block_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ gtk_widget_grab_focus(widget);
+ g_signal_handlers_unblock_by_func(G_OBJECT(widget),
+ G_CALLBACK(compose_grab_focus_cb),
+ compose);
+ }
+#endif
}
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
compose->modified = TRUE;
+#ifndef MAEMO
compose_set_title(compose);
+#endif
}
static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
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)
+ for (tmp = list; tmp != NULL; tmp = tmp->next) {
+ gchar *utf8_filename = conv_filename_to_utf8((const gchar *)tmp->data);
compose_attach_append
(compose, (const gchar *)tmp->data,
- (const gchar *)tmp->data, NULL);
+ utf8_filename, NULL);
+ g_free(utf8_filename);
+ }
if (list) compose_changed_cb(NULL, compose);
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;
compose->remove_references = FALSE;
}
-gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
+static gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry)
{
return FALSE;
}
-gboolean compose_headerentry_changed_cb(GtkWidget *entry,
+static gboolean compose_headerentry_changed_cb(GtkWidget *entry,
ComposeHeaderEntry *headerentry)
{
if (strlen(gtk_entry_get_text(GTK_ENTRY(entry))) != 0) {
- headerentry->compose->header_list =
- g_slist_append(headerentry->compose->header_list,
- headerentry);
-
compose_create_header_entry(headerentry->compose);
g_signal_handlers_disconnect_matched
(G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
+ gtk_adjustment_changed(vadj);
}
static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
compose);
if (paste_as_quotation) {
gchar *new_text;
- gchar *qmark;
+ const gchar *qmark;
+ guint pos = 0;
+ GtkTextIter start_iter;
if (len < 0)
len = strlen(text);
new_text = g_strndup(text, len);
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
+
+ qmark = compose_quote_char_from_context(compose);
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);
+ pos = gtk_text_iter_get_offset(iter);
+
+ compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE, FALSE,
+ _("Quote format error at line %d."));
quote_fmt_reset_vartable();
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
gtk_text_buffer_place_cursor(buffer, iter);
+ gtk_text_buffer_delete_mark(buffer, mark);
+
+ gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, pos);
+ mark = gtk_text_buffer_create_mark(buffer, NULL, &start_iter, FALSE);
+ compose_beautify_paragraph(compose, &start_iter, FALSE);
+ gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+ gtk_text_buffer_delete_mark(buffer, mark);
} else {
- if (strcmp(text, "\n") || automatic_break
+ if (strcmp(text, "\n") || compose->automatic_break
|| gtk_text_iter_starts_line(iter))
gtk_text_buffer_insert(buffer, iter, text, len);
else {
}
}
- mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
-
- compose_beautify_paragraph(compose, iter, FALSE);
-
- gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
- gtk_text_buffer_delete_mark(buffer, mark);
+ if (!paste_as_quotation) {
+ mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
+ compose_beautify_paragraph(compose, iter, FALSE);
+ gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
+ gtk_text_buffer_delete_mark(buffer, mark);
+ }
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
g_signal_stop_emission_by_name(G_OBJECT(buffer), "insert-text");
if (prefs_common.autosave &&
- gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0)
- compose->draft_timeout_tag = gtk_timeout_add
+ gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0 &&
+ compose->draft_timeout_tag != -2 /* disabled while loading */)
+ compose->draft_timeout_tag = g_timeout_add
(500, (GtkFunction) compose_defer_auto_save_draft, compose);
}
static gint compose_defer_auto_save_draft(Compose *compose)
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);
}
}
* drafting to be done, before destroying the compose under
* it. */
debug_print("waiting for drafting to finish...\n");
+ compose_allow_user_actions(compose, FALSE);
g_timeout_add (500, (GSourceFunc) compose_close, compose);
return FALSE;
}
if (g_slist_length(msginfo_list) == 1 && !opening_multiple) {
MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
MsgInfo *orig_msginfo = (MsgInfo *)msginfo_list->data;
-
+
if (mimeinfo != NULL && mimeinfo->type == MIMETYPE_MESSAGE &&
!g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
tmp_msginfo = procmsg_msginfo_new_from_mimeinfo(
orig_msginfo, mimeinfo);
if (tmp_msginfo != NULL) {
new_msglist = g_slist_append(NULL, tmp_msginfo);
- if (procmime_msginfo_is_encrypted(orig_msginfo)) {
- originally_enc = TRUE;
- }
- }
+
+ originally_enc = MSG_IS_ENCRYPTED(orig_msginfo->flags);
+ tmp_msginfo->folder = orig_msginfo->folder;
+ tmp_msginfo->msgnum = orig_msginfo->msgnum;
+ if (orig_msginfo->tags)
+ tmp_msginfo->tags = g_slist_copy(orig_msginfo->tags);
+ }
}
}
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_translated_header_name("To:")) == 0 ) {
+ if ( newmsginfo->to == NULL ) {
+ newmsginfo->to = g_strdup(entry);
+ } else if (entry && *entry) {
+ gchar *tmp = g_strconcat(newmsginfo->to, ", ", entry, NULL);
+ g_free(newmsginfo->to);
+ newmsginfo->to = tmp;
+ }
+ } else
+ if ( strcasecmp(header, prefs_common_translated_header_name("Cc:")) == 0 ) {
+ if ( newmsginfo->cc == NULL ) {
+ newmsginfo->cc = g_strdup(entry);
+ } else if (entry && *entry) {
+ gchar *tmp = g_strconcat(newmsginfo->cc, ", ", entry, NULL);
+ g_free(newmsginfo->cc);
+ newmsginfo->cc = tmp;
+ }
+ } else
+ if ( strcasecmp(header,
+ prefs_common_translated_header_name("Newsgroups:")) == 0 ) {
+ if ( newmsginfo->newsgroups == NULL ) {
+ newmsginfo->newsgroups = g_strdup(entry);
+ } else if (entry && *entry) {
+ 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;
+}
+
+#ifdef USE_ASPELL
+/* update compose's dictionaries from folder dict settings */
+static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
+ FolderItem *folder_item)
+{
+ g_return_if_fail(compose != NULL);
+
+ if (compose->gtkaspell && folder_item && folder_item->prefs) {
+ FolderItemPrefs *prefs = folder_item->prefs;
+
+ if (prefs->enable_default_dictionary)
+ gtkaspell_change_dict(compose->gtkaspell,
+ prefs->default_dictionary, FALSE);
+ if (folder_item->prefs->enable_default_alt_dictionary)
+ gtkaspell_change_alt_dict(compose->gtkaspell,
+ prefs->default_alt_dictionary);
+ if (prefs->enable_default_dictionary
+ || prefs->enable_default_alt_dictionary)
+ compose_spell_menu_changed(compose);
+ }
+}
+#endif
+
/*
* End of Source.
*/
projects / claws.git / blobdiff