#include "customheader.h"
#include "prefs_common.h"
#include "prefs_account.h"
+#include "prefs_actions.h"
#include "account.h"
#include "filesel.h"
#include "procheader.h"
#include "template.h"
#include "undo.h"
#include "foldersel.h"
-#include "prefs_actions.h"
+#include "toolbar.h"
#if USE_GPGME
# include "rfc2015.h"
COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END
} ComposeCallGtkSTextAction;
+typedef enum
+{
+ PRIORITY_HIGHEST = 1,
+ PRIORITY_HIGH,
+ PRIORITY_NORMAL,
+ PRIORITY_LOW,
+ PRIORITY_LOWEST
+} PriorityLevel;
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
Compose *compose_generic_new (PrefsAccount *account,
const gchar *to,
- FolderItem *item);
+ FolderItem *item,
+ GPtrArray *attach_files);
static Compose *compose_create (PrefsAccount *account,
ComposeMode mode);
static void compose_toolbar_create (Compose *compose,
GtkWidget *container);
+static void compose_toolbar_update (Compose *compose);
+static void compose_toolbar_set_sensitive (Compose *compose,
+ gboolean sensitive);
+
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
static void compose_set_template_menu (Compose *compose);
static void compose_template_apply (Compose *compose,
- Template *tmpl);
+ Template *tmpl,
+ gboolean replace);
static void compose_destroy (Compose *compose);
static void compose_entries_set (Compose *compose,
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
gboolean to_all,
+ gboolean to_ml,
gboolean to_sender,
gboolean
followup_and_reply_to);
MsgInfo *msginfo);
static void compose_wrap_line (Compose *compose);
static void compose_wrap_line_all (Compose *compose);
+static void compose_wrap_line_all_full (Compose *compose,
+ gboolean autowrap);
static void compose_set_title (Compose *compose);
+static void compose_select_account (Compose *compose,
+ PrefsAccount *account);
static PrefsAccount *compose_current_mail_account(void);
/* static gint compose_send (Compose *compose); */
static gboolean compose_check_for_valid_recipient
(Compose *compose);
-static gboolean compose_check_entries (Compose *compose);
+static gboolean compose_check_entries (Compose *compose,
+ gboolean check_subject);
static gint compose_write_to_file (Compose *compose,
const gchar *file,
gboolean is_draft);
static gint compose_write_body_to_file (Compose *compose,
const gchar *file);
static gint compose_remove_reedit_target (Compose *compose);
+void compose_remove_draft (Compose *compose);
static gint compose_queue (Compose *compose,
gint *msgnum,
FolderItem **item);
+static gint compose_queue_sub (Compose *compose,
+ gint *msgnum,
+ FolderItem **item,
+ gboolean check_subject);
static void compose_write_attach (Compose *compose,
FILE *fp);
static gint compose_write_headers (Compose *compose,
static void compose_create_header_entry (Compose *compose);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
+static void compose_update_priority_menu_item(Compose * compose);
/* callback functions */
gpointer data);
static void toolbar_address_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_compose_buttons_cb (GtkWidget *widget,
-static void select_account (Compose *compose,
- PrefsAccount *ac);
-
+ ToolbarItem *t_item);
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
static void compose_cut_cb (Compose *compose);
static void compose_copy_cb (Compose *compose);
static void compose_paste_cb (Compose *compose);
+static void compose_paste_as_quote_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
static void compose_gtk_stext_action_cb (Compose *compose,
static void compose_toggle_encrypt_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_set_gnupg_mode_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
+static void compose_update_gnupg_mode_menu_item(Compose * compose);
+static void activate_gnupg_mode (Compose *compose,
+ PrefsAccount *account);
#endif
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget);
+static void compose_set_priority_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
static void compose_attach_drag_received_cb (GtkWidget *widget,
GdkDragContext *drag_context,
Compose *compose);
static void newsgroups_activated (GtkWidget *widget,
Compose *compose);
-static void subject_activated (GtkWidget *widget,
- Compose *compose);
static void cc_activated (GtkWidget *widget,
Compose *compose);
static void bcc_activated (GtkWidget *widget,
Compose *compose);
static void followupto_activated (GtkWidget *widget,
Compose *compose);
+static void subject_activated (GtkWidget *widget,
+ Compose *compose);
#endif
+static void text_activated (GtkWidget *widget,
+ Compose *compose);
+static void text_inserted (GtkWidget *widget,
+ const gchar *text,
+ gint length,
+ gint *position,
+ Compose *compose);
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
- gboolean to_all,
+ gboolean to_all, gboolean to_ml,
gboolean ignore_replyto,
gboolean followup_and_reply_to,
const gchar *body);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
-#if USE_PSPELL
+#if USE_ASPELL
static void compose_check_all (Compose *compose);
static void compose_highlight_all (Compose *compose);
static void compose_check_backwards (Compose *compose);
static void compose_check_forwards_go (Compose *compose);
#endif
-static gboolean compose_send_control_enter (Compose *compose);
-static void text_activated (GtkWidget *widget,
- Compose *compose);
+static gboolean compose_send_control_enter (Compose *compose);
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Edit/Cu_t"), "<control>X", compose_cut_cb, 0, NULL},
{N_("/_Edit/_Copy"), "<control>C", compose_copy_cb, 0, NULL},
{N_("/_Edit/_Paste"), "<control>V", compose_paste_cb, 0, NULL},
+ {N_("/_Edit/Paste as _quotation"),
+ NULL, compose_paste_as_quote_cb, 0, NULL},
{N_("/_Edit/Select _all"), "<control>A", compose_allsel_cb, 0, NULL},
{N_("/_Edit/A_dvanced"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/A_dvanced/Move a character backward"),
"<control><alt>L", compose_wrap_line_all, 0, NULL},
{N_("/_Edit/Edit with e_xternal editor"),
"<shift><control>X", compose_ext_editor_cb, 0, NULL},
-#if USE_PSPELL
+#if USE_ASPELL
{N_("/_Spelling"), NULL, NULL, 0, "<Branch>"},
{N_("/_Spelling/_Check all or check selection"),
NULL, compose_check_all, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
{N_("/_Message/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
+ {N_("/_Message/Mode/MIME"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_DETACH, "<RadioItem>"},
+ {N_("/_Message/Mode/Inline"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_INLINE, "/Message/Mode/MIME"},
#endif /* USE_GPGME */
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Priority"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/Priority/_Highest"), NULL, compose_set_priority_cb, PRIORITY_HIGHEST, "<RadioItem>"},
+ {N_("/_Message/Priority/Hi_gh"), NULL, compose_set_priority_cb, PRIORITY_HIGH, "/Message/Priority/Highest"},
+ {N_("/_Message/Priority/_Normal"), NULL, compose_set_priority_cb, PRIORITY_NORMAL, "/Message/Priority/Highest"},
+ {N_("/_Message/Priority/Lo_w"), NULL, compose_set_priority_cb, PRIORITY_LOW, "/Message/Priority/Highest"},
+ {N_("/_Message/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Message/Priority/Highest"},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{"text/uri-list", 0, 0}
};
-Compose *compose_new(PrefsAccount *account)
-{
- return compose_generic_new(account, NULL, NULL);
-}
-
-Compose *compose_bounce(PrefsAccount *account, MsgInfo *msginfo)
-{
- Compose *c;
- gchar *filename;
- GtkItemFactory *ifactory;
-
- c = compose_generic_new(account, NULL, NULL);
-
- filename = procmsg_get_message_file(msginfo);
- if (filename == NULL)
- return NULL;
-
- c->bounce_filename = filename;
-
- if (msginfo->subject)
- gtk_entry_set_text(GTK_ENTRY(c->subject_entry),
- msginfo->subject);
- gtk_editable_set_editable(GTK_EDITABLE(c->subject_entry), FALSE);
-
- compose_quote_fmt(c, msginfo, "%M", NULL, NULL);
- gtk_editable_set_editable(GTK_EDITABLE(c->text), FALSE);
-
- ifactory = gtk_item_factory_from_widget(c->popupmenu);
- menu_set_sensitive(ifactory, "/Add...", FALSE);
- menu_set_sensitive(ifactory, "/Remove", FALSE);
- menu_set_sensitive(ifactory, "/Property...", FALSE);
-
- ifactory = gtk_item_factory_from_widget(c->menubar);
- menu_set_sensitive(ifactory, "/File/Insert file", FALSE);
- menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
- menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Paste", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Edit with external editor", FALSE);
- menu_set_sensitive(ifactory, "/Message/Attach", FALSE);
-#if USE_GPGME
- menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
- menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
-#endif
- menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
- menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
-
- gtk_widget_set_sensitive(c->insert_btn, FALSE);
- gtk_widget_set_sensitive(c->attach_btn, FALSE);
- gtk_widget_set_sensitive(c->sig_btn, FALSE);
- gtk_widget_set_sensitive(c->exteditor_btn, FALSE);
- gtk_widget_set_sensitive(c->linewrap_btn, FALSE);
-
- return c;
-}
-
-Compose *compose_new_with_recipient(PrefsAccount *account, const gchar *mailto)
+Compose *compose_new(PrefsAccount *account, const gchar *mailto,
+ GPtrArray *attach_files)
{
- return compose_generic_new(account, mailto, NULL);
+ return compose_generic_new(account, mailto, NULL, attach_files);
}
Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
{
- return compose_generic_new(account, NULL, item);
+ return compose_generic_new(account, NULL, item, NULL);
}
-Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderItem *item)
+Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderItem *item,
+ GPtrArray *attach_files)
{
Compose *compose;
+ GtkSText *text;
+ GtkItemFactory *ifactory;
+ gboolean grab_focus_on_last = TRUE;
if (item && item->prefs && item->prefs->enable_default_account)
account = account_find_from_id(item->prefs->default_account);
g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, COMPOSE_NEW);
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
compose->replyinfo = NULL;
+ text = GTK_STEXT(compose->text);
+ gtk_stext_freeze(text);
+
if (prefs_common.auto_sig)
compose_insert_sig(compose);
- gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
- gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ gtk_editable_set_position(GTK_EDITABLE(text), 0);
+ gtk_stext_set_point(text, 0);
+
+ gtk_stext_thaw(text);
if (account->protocol != A_NNTP) {
- if (mailto) {
+ if (mailto && *mailto != '\0') {
compose_entries_set(compose, mailto);
- } else if(item && item->prefs->enable_default_to) {
+ } else if (item && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
+ compose_entry_select(compose, item->prefs->default_to);
+ grab_focus_on_last = FALSE;
}
if (item && item->ret_rcpt) {
- GtkItemFactory *ifactory;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
}
} else {
if (mailto) {
compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
}
+ /*
+ * CLAWS: just don't allow return receipt request, even if the user
+ * may want to send an email. simple but foolproof.
+ */
+ menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
+ }
+
+ if (attach_files) {
+ gint i;
+ gchar *file;
+
+ for (i = 0; i < attach_files->len; i++) {
+ file = g_ptr_array_index(attach_files, i);
+ compose_attach_append(compose, file, file, NULL);
+ }
}
+
compose_show_first_last_header(compose, TRUE);
/* Set save folder */
- if(item && item->prefs && item->prefs->save_copy_to_folder) {
+ if (item && item->prefs && item->prefs->save_copy_to_folder) {
gchar *folderidentifier;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
g_free(folderidentifier);
}
-
- gtk_widget_grab_focus(compose->header_last->entry);
+
+ /* Grab focus on last header only if no default_to was set */
+ if (grab_focus_on_last)
+ gtk_widget_grab_focus(compose->header_last->entry);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
return compose;
}
-#define CHANGE_FLAGS(msginfo) \
-{ \
-if (msginfo->folder->folder->change_flags != NULL) \
-msginfo->folder->folder->change_flags(msginfo->folder->folder, \
- msginfo->folder, \
- msginfo); \
-}
-
/*
Compose *compose_new_followup_and_replyto(PrefsAccount *account,
const gchar *followupto, gchar * to)
*/
void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
- gboolean ignore_replyto, const gchar *body)
+ gboolean to_ml, gboolean ignore_replyto,
+ const gchar *body)
{
- compose_generic_reply(msginfo, quote, to_all, ignore_replyto, FALSE,
- body);
+ compose_generic_reply(msginfo, quote, to_all, to_ml,
+ ignore_replyto, FALSE, body);
}
void compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
gboolean ignore_replyto,
const gchar *body)
{
- compose_generic_reply(msginfo, quote, to_all, ignore_replyto, TRUE,
- body);
+ compose_generic_reply(msginfo, quote, to_all, FALSE,
+ ignore_replyto, TRUE, body);
}
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
- gboolean to_all,
+ gboolean to_all, gboolean to_ml,
gboolean ignore_replyto,
gboolean followup_and_reply_to,
const gchar *body)
}
if (!account) {
gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
+ if (!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
} else
reply_account = account;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_REPLIED);
- CHANGE_FLAGS(msginfo);
-
compose = compose_create(account, COMPOSE_REPLY);
- compose->replyinfo = procmsg_msginfo_copy(msginfo);
-#if 0 /* NEW COMPOSE GUI */
- if (followup_and_reply_to) {
- gtk_widget_show(compose->to_hbox);
- gtk_widget_show(compose->to_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 4);
- compose->use_to = TRUE;
- }
-#endif
+ compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
+ if (!compose->replyinfo)
+ compose->replyinfo = procmsg_msginfo_copy(msginfo);
+
if (msginfo->folder && msginfo->folder->ret_rcpt) {
GtkItemFactory *ifactory;
}
/* Set save folder */
- if(msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
+ if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
gchar *folderidentifier;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
}
if (compose_parse_header(compose, msginfo) < 0) return;
- compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto,
- followup_and_reply_to);
+ compose_reply_set_entry(compose, msginfo, to_all, to_ml,
+ ignore_replyto, followup_and_reply_to);
compose_show_first_last_header(compose, TRUE);
text = GTK_STEXT(compose->text);
else
qmark = "> ";
- quote_str = compose_quote_fmt(compose, msginfo,
+ quote_str = compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
qmark, body);
}
static void set_toolbar_style(Compose *compose);
-static gchar *procmime_get_file_name(MimeInfo *mimeinfo)
-{
- gchar *base;
- gchar *filename;
-
- g_return_val_if_fail(mimeinfo != NULL, NULL);
-
- base = mimeinfo->filename ? mimeinfo->filename
- : mimeinfo->name ? mimeinfo->name : NULL;
-
- if (MIME_TEXT_HTML == mimeinfo->mime_type && base == NULL){
- filename = g_strdup_printf("%s%smimetmp.%08x.html",
- get_mime_tmp_dir(),
- G_DIR_SEPARATOR_S,
- (gint)mimeinfo);
- return filename;
- }
- else {
- base = base ? base : "";
- base = g_basename(base);
- if (*base == '\0') {
- filename = g_strdup_printf("%s%smimetmp.%08x",
- get_mime_tmp_dir(),
- G_DIR_SEPARATOR_S,
- (gint)mimeinfo);
- return filename;
- }
- }
-
- filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
- base, NULL);
-
- return filename;
-}
-
-static gchar *mime_extract_file(gchar *source, MimeInfo *partinfo)
-{
- gchar *filename;
-
- if (!partinfo) return NULL;
-
- filename = procmime_get_file_name(partinfo);
-
- if (procmime_get_part(filename, source, partinfo) < 0)
- alertpanel_error
- (_("Can't get the part of multipart message."));
-
- return filename;
-}
-
-
-
#define INSERT_FW_HEADER(var, hdr) \
if (msginfo->var && *msginfo->var) { \
gtk_stext_insert(text, NULL, NULL, NULL, hdr, -1); \
gboolean as_attach, const gchar *body)
{
Compose *compose;
- /* PrefsAccount *account; */
GtkSText *text;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
- account = msginfo->folder->folder->account;
+ if (!account)
+ account = msginfo->folder->folder->account;
if (!account && msginfo->to && prefs_common.forward_account_autosel) {
gchar *to;
Xstrdup_a(to, msginfo->to, return NULL);
account = account_find_from_address(to);
}
- if(!account && prefs_common.forward_account_autosel) {
+ if (!account && prefs_common.forward_account_autosel) {
gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+ if (!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
if (MSG_IS_IMAP(msginfo->flags))
imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
- CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_FORWARD);
} else {
gchar *qmark;
gchar *quote_str;
+ 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)
else
qmark = "> ";
- quote_str = compose_quote_fmt(compose, msginfo,
+ quote_str = compose_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
qmark, body);
compose_attach_parts(compose, msginfo);
+
+ procmsg_msginfo_free(full_msginfo);
}
if (prefs_common.auto_sig)
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
MSG_UNSET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_REPLIED);
MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
- CHANGE_FLAGS(((MsgInfo *)msginfo->data));
}
compose = compose_create(account, COMPOSE_FORWARD);
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
gtk_stext_thaw(text);
+ gtk_widget_grab_focus(compose->header_last->entry);
+
#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP)
gtk_widget_grab_focus(compose->to_entry);
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- if (msginfo->folder->stype == F_QUEUE) {
+ if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
gchar queueheader_buf[BUFFSIZE];
gint id;
compose = compose_create(account, COMPOSE_REEDIT);
compose->targetinfo = procmsg_msginfo_copy(msginfo);
- if (msginfo->folder->stype == F_QUEUE) {
+ if (msginfo->folder->stype == F_QUEUE
+ || msginfo->folder->stype == F_DRAFT) {
gchar queueheader_buf[BUFFSIZE];
/* Set message save folder */
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning(_("Can't get text part\n"));
else {
- while (fgets(buf, sizeof(buf), fp) != NULL)
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ strcrchomp(buf);
gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ }
fclose(fp);
}
compose_attach_parts(compose, msginfo);
compose_exec_ext_editor(compose);
}
+Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
+{
+ Compose *compose;
+ gchar *filename;
+ GtkItemFactory *ifactory;
+
+ g_return_val_if_fail(msginfo != NULL, NULL);
+
+ if (!account)
+ account = cur_account;
+ g_return_val_if_fail(account != NULL, NULL);
+
+ compose = compose_create(account, COMPOSE_REDIRECT);
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ compose->replyinfo = NULL;
+
+ compose_show_first_last_header(compose, TRUE);
+
+ gtk_widget_grab_focus(compose->header_last->entry);
+
+ filename = procmsg_get_message_file(msginfo);
+ if (filename == NULL)
+ return NULL;
+
+ compose->redirect_filename = filename;
+
+ if (msginfo->subject)
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
+ msginfo->subject);
+ gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
+
+ gtk_stext_freeze(GTK_STEXT(compose->text));
+ compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
+ gtk_editable_set_editable(GTK_EDITABLE(compose->text), FALSE);
+ gtk_stext_thaw(GTK_STEXT(compose->text));
+
+ ifactory = gtk_item_factory_from_widget(compose->popupmenu);
+ menu_set_sensitive(ifactory, "/Add...", FALSE);
+ menu_set_sensitive(ifactory, "/Remove", FALSE);
+ menu_set_sensitive(ifactory, "/Property...", FALSE);
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_sensitive(ifactory, "/File/Insert file", FALSE);
+ menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
+ menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Paste", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Edit with external editor", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Attach", FALSE);
+#if USE_GPGME
+ menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Mode/MIME", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Mode/Inline", FALSE);
+#endif
+ menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
+ menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
+
+ gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, FALSE);
+
+ return compose;
+}
+
GList *compose_get_compose_list(void)
{
return compose_list;
void compose_entry_append(Compose *compose, const gchar *address,
ComposeEntryType type)
{
- GtkEntry *entry;
- const gchar *text;
gchar *header;
if (!address || *address == '\0') return;
compose_add_header_entry(compose, header, (gchar *)address);
}
+void compose_entry_select (Compose *compose, const gchar *mailto)
+{
+ GSList *header_list;
+
+ for (header_list = compose->header_list; header_list != NULL; header_list = header_list->next) {
+ GtkEntry * entry = GTK_ENTRY(((ComposeHeaderEntry *)header_list->data)->entry);
+
+ if (gtk_entry_get_text(entry) && !g_strcasecmp(gtk_entry_get_text(entry), mailto)) {
+ gtk_entry_select_region(entry, 0, -1);
+ gtk_widget_grab_focus(GTK_WIDGET(entry));
+ }
+ }
+}
+
static void compose_entries_set(Compose *compose, const gchar *mailto)
{
- gchar *subject = NULL;
gchar *to = NULL;
gchar *cc = NULL;
gchar *bcc = NULL;
+ gchar *subject = NULL;
gchar *body = NULL;
- gchar *p;
- gchar *tmp_mailto;
-
- Xstrdup_a(tmp_mailto, mailto, return);
-
- to = tmp_mailto;
-
- p = strchr(tmp_mailto, '?');
- if (p) {
- *p = '\0';
- p++;
- }
-
- while (p) {
- gchar *field, *value;
-
- field = p;
-
- p = strchr(p, '=');
- if (!p) break;
- *p = '\0';
- p++;
- value = p;
-
- p = strchr(p, '&');
- if (p) {
- *p = '\0';
- p++;
- }
-
- if (*value == '\0') continue;
-
- if (!g_strcasecmp(field, "subject")) {
- Xalloca(subject, strlen(value) + 1, return);
- decode_uri(subject, value);
- } else if (!g_strcasecmp(field, "cc")) {
- cc = value;
- } else if (!g_strcasecmp(field, "bcc")) {
- bcc = value;
- } else if (!g_strcasecmp(field, "body")) {
- Xalloca(body, strlen(value) + 1, return);
- decode_uri(body, value);
- }
- }
+ scan_mailto_url(mailto, &to, &cc, &bcc, &subject, &body);
if (to)
compose_entry_append(compose, to, COMPOSE_TO);
- if (subject)
- gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
if (cc)
compose_entry_append(compose, cc, COMPOSE_CC);
if (bcc)
compose_entry_append(compose, bcc, COMPOSE_BCC);
+ if (subject)
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
if (body) {
gtk_stext_insert(GTK_STEXT(compose->text),
NULL, NULL, NULL, body, -1);
gtk_stext_insert(GTK_STEXT(compose->text),
NULL, NULL, NULL, "\n", 1);
}
+
+ g_free(to);
+ g_free(cc);
+ g_free(bcc);
+ g_free(subject);
+ g_free(body);
}
static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
{
- static HeaderEntry hentry[] = {{"Reply-To:", NULL, TRUE},
- {"Cc:", NULL, FALSE},
- {"References:", NULL, FALSE},
- {"Bcc:", NULL, FALSE},
- {"Newsgroups:", NULL, FALSE},
- {"Followup-To:", NULL, FALSE},
- {"X-Mailing-List:", NULL, FALSE},
- {"X-BeenThere:", NULL, FALSE},
- {NULL, NULL, FALSE}};
+ static HeaderEntry hentry[] = {{"Reply-To:", NULL, TRUE},
+ {"Cc:", NULL, FALSE},
+ {"References:", NULL, FALSE},
+ {"Bcc:", NULL, FALSE},
+ {"Newsgroups:", NULL, FALSE},
+ {"Followup-To:", NULL, FALSE},
+ {"List-Post:", NULL, FALSE},
+ {"X-Priority:", NULL, FALSE},
+ {NULL, NULL, FALSE}};
enum
{
- H_REPLY_TO = 0,
- H_CC = 1,
- H_REFERENCES = 2,
- H_BCC = 3,
- H_NEWSGROUPS = 4,
- H_FOLLOWUP_TO = 5,
- H_X_MAILING_LIST = 6,
- H_X_BEENTHERE = 7
+ H_REPLY_TO = 0,
+ H_CC = 1,
+ H_REFERENCES = 2,
+ H_BCC = 3,
+ H_NEWSGROUPS = 4,
+ H_FOLLOWUP_TO = 5,
+ H_LIST_POST = 6,
+ H_X_PRIORITY = 7
};
FILE *fp;
compose->cc = hentry[H_CC].body;
hentry[H_CC].body = NULL;
}
- if (hentry[H_X_MAILING_LIST].body != NULL) {
- /* this is good enough to parse debian-devel */
- gchar *buf = g_malloc(strlen(hentry[H_X_MAILING_LIST].body) + 1);
- g_return_val_if_fail(buf != NULL, -1 );
- if (1 == sscanf(hentry[H_X_MAILING_LIST].body, "<%[^>]>", buf))
- compose->mailinglist = g_strdup(buf);
- g_free(buf);
- g_free(hentry[H_X_MAILING_LIST].body);
- hentry[H_X_MAILING_LIST].body = NULL ;
- }
- if (hentry[H_X_BEENTHERE].body != NULL) {
- /* this is good enough to parse the sylpheed-claws lists */
- gchar *buf = g_malloc(strlen(hentry[H_X_BEENTHERE].body) + 1);
- g_return_val_if_fail(buf != NULL, -1 );
- if (1 == sscanf(hentry[H_X_BEENTHERE].body, "%[^>]", buf))
- compose->mailinglist = g_strdup(buf);
- g_free(buf);
- g_free(hentry[H_X_BEENTHERE].body);
- hentry[H_X_BEENTHERE].body = NULL ;
- }
if (hentry[H_REFERENCES].body != NULL) {
if (compose->mode == COMPOSE_REEDIT)
compose->references = hentry[H_REFERENCES].body;
compose->followup_to = hentry[H_FOLLOWUP_TO].body;
hentry[H_FOLLOWUP_TO].body = NULL;
}
+ if (hentry[H_LIST_POST].body != NULL) {
+ gchar *to = NULL;
+
+ 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);
+ if (to) {
+ g_free(compose->ml_post);
+ compose->ml_post = to;
+ }
+ }
+ g_free(hentry[H_LIST_POST].body);
+ hentry[H_LIST_POST].body = NULL;
+ }
+ /* CLAWS - X-Priority */
+ if (compose->mode == COMPOSE_REEDIT)
+ if (hentry[H_X_PRIORITY].body != NULL) {
+ gint priority;
+
+ priority = atoi(hentry[H_X_PRIORITY].body);
+ g_free(hentry[H_X_PRIORITY].body);
+
+ hentry[H_X_PRIORITY].body = NULL;
+
+ if (priority < PRIORITY_HIGHEST ||
+ priority > PRIORITY_LOWEST)
+ priority = PRIORITY_NORMAL;
+
+ compose->priority = priority;
+ }
+
if (compose->mode == COMPOSE_REEDIT && msginfo->inreplyto)
compose->inreplyto = g_strdup(msginfo->inreplyto);
else if (compose->mode != COMPOSE_REEDIT &&
const gchar *body)
{
GtkSText *text = GTK_STEXT(compose->text);
+ static MsgInfo dummyinfo;
gchar *quote_str = NULL;
gchar *buf;
gchar *p, *lastp;
gint len;
+ if (!msginfo)
+ msginfo = &dummyinfo;
+
if (qmark != NULL) {
quote_fmt_init(msginfo, NULL, NULL);
quote_fmt_scan_string(qmark);
}
static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
- gboolean to_all, gboolean ignore_replyto,
+ gboolean to_all, gboolean to_ml,
+ gboolean ignore_replyto,
gboolean followup_and_reply_to)
{
GSList *cc_list = NULL;
g_return_if_fail(compose->account != NULL);
g_return_if_fail(msginfo != NULL);
- if ((compose->account->protocol != A_NNTP) || followup_and_reply_to)
- compose_entry_append(compose,
- ((compose->replyto && !ignore_replyto)
- ? compose->replyto
- : (compose->mailinglist && !ignore_replyto)
- ? compose->mailinglist
- : msginfo->from ? msginfo->from : ""),
- COMPOSE_TO);
-
- if (compose->account->protocol == A_NNTP) {
+ if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
+ if (!compose->replyto && to_ml && compose->ml_post)
+ compose_entry_append(compose,
+ compose->ml_post,
+ COMPOSE_TO);
+ else if (!(to_all || ignore_replyto)
+ && msginfo->folder
+ && msginfo->folder->prefs->enable_default_reply_to) {
+ compose_entry_append(compose,
+ msginfo->folder->prefs->default_reply_to,
+ COMPOSE_TO);
+ } else
+ compose_entry_append(compose,
+ (compose->replyto && !ignore_replyto)
+ ? compose->replyto
+ : msginfo->from ? msginfo->from : "",
+ COMPOSE_TO);
+ } else {
if (ignore_replyto)
compose_entry_append
(compose, msginfo->from ? msginfo->from : "",
COMPOSE_TO);
- else
- compose_entry_append
- (compose,
- compose->followup_to ? compose->followup_to
- : compose->newsgroups ? compose->newsgroups
- : "",
- COMPOSE_NEWSGROUPS);
+ else {
+ if (compose->followup_to && !strncmp(compose->followup_to, "poster", 6)) {
+ compose_entry_append
+ (compose,
+ ((compose->replyto && !ignore_replyto)
+ ? compose->replyto
+ : msginfo->from ? msginfo->from : ""),
+ COMPOSE_TO);
+ } else {
+ compose_entry_append
+ (compose,
+ compose->followup_to ? compose->followup_to
+ : compose->newsgroups ? compose->newsgroups
+ : "",
+ COMPOSE_NEWSGROUPS);
+ }
+ }
}
if (msginfo->subject && *msginfo->subject) {
} else
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), "Re: ");
+ if (to_ml && compose->ml_post) return;
if (!to_all || compose->account->protocol == A_NNTP) return;
if (compose->replyto) {
extract_address(from);
}
- if (compose->mailinglist && from) {
- cc_list = address_list_append(cc_list, from);
- }
-
if (replyto && from)
cc_list = address_list_append(cc_list, from);
-
- if (!compose->mailinglist)
- cc_list = address_list_append(cc_list, msginfo->to);
-
+ cc_list = address_list_append(cc_list, msginfo->to);
cc_list = address_list_append(cc_list, compose->cc);
to_table = g_hash_table_new(g_str_hash, g_str_equal);
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
+ compose_update_priority_menu_item(compose);
+#if USE_GPGME
+ compose_update_gnupg_mode_menu_item(compose);
+#endif
compose_show_first_last_header(compose, TRUE);
#if 0 /* NEW COMPOSE GUI */
static void compose_exec_sig(Compose *compose, gchar *sigfile)
{
- FILE *tmpfp;
- pid_t thepid;
- gchar *sigtext;
FILE *sigprg;
gchar *buf;
size_t buf_len = 128;
(_("Message: %s"),
g_basename(filename ? filename : file));
} else {
- ainfo->encoding = ENC_BASE64;
+ if (!g_strncasecmp(content_type, "text", 4))
+ ainfo->encoding =
+ procmime_get_encoding_for_file(file);
+ else
+ ainfo->encoding = ENC_BASE64;
ainfo->name = g_strdup
(g_basename(filename ? filename : file));
}
} else {
ainfo->content_type = procmime_get_mime_type(file);
- if (!ainfo->content_type)
+ if (!ainfo->content_type) {
ainfo->content_type =
g_strdup("application/octet-stream");
- ainfo->encoding = ENC_BASE64;
+ ainfo->encoding = ENC_BASE64;
+ } else if (!g_strncasecmp(ainfo->content_type, "text", 4))
+ ainfo->encoding = procmime_get_encoding_for_file(file);
+ else
+ ainfo->encoding = ENC_BASE64;
ainfo->name = g_strdup(g_basename(filename ? filename : file));
}
ainfo->size = size;
procmime_mimeinfo_free_all(mimeinfo);
return;
}
+
if (IS_FIRST_PART_TEXT(child))
child = child->next;
child = procmime_mimeinfo_next(child);
continue;
}
-
+ if(child->parent && child->parent->parent
+ && !strcasecmp(child->parent->parent->content_type, "multipart/signed")
+ && child->mime_type == MIME_TEXT) {
+ /* this is the main text part of a signed message */
+ child = procmime_mimeinfo_next(child);
+ continue;
+ }
outfile = procmime_get_tmp_file_name(child);
if (procmime_get_part(outfile, infile, child) < 0)
g_warning(_("Can't get the part of multipart message."));
- else
+ else if (compose->mode != COMPOSE_REEDIT || strcmp(child->content_type, "application/pgp-signature"))
compose_attach_append
(compose, outfile,
child->filename ? child->filename : child->name,
} \
}
+#define INDENT_CHARS ">|#"
+#define SPACE_CHARS " \t"
+
static void compose_wrap_line(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
}
line_end = 1;
} else {
- if (ch_len == 1 && strchr(">|:#", *cbuf))
+ if (ch_len == 1
+ && strchr(prefs_common.quote_chars, *cbuf))
quoted = 1;
else if (ch_len != 1 || !isspace(*cbuf))
quoted = 0;
}
line_end = 1;
} else {
- if (line_end && ch_len == 1 && strchr(">|:#", *cbuf))
+ if (line_end && ch_len == 1 &&
+ strchr(prefs_common.quote_chars, *cbuf))
goto compose_end; /* quoted part */
line_end = 0;
gtk_stext_thaw(text);
}
-/* return indent length */
-static guint get_indent_length(GtkSText *text, guint start_pos, guint text_len)
+#undef WRAP_DEBUG
+#ifdef WRAP_DEBUG
+/* Darko: used when I debug wrapping */
+void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
{
- gint indent_len = 0;
- gint i, ch_len;
+ gint i, clen;
gchar cbuf[MB_LEN_MAX];
- for (i = start_pos; i < text_len; i++) {
- GET_CHAR(i, cbuf, ch_len);
- if (ch_len > 1)
- break;
- /* allow space, tab, >, |, : or # */
- if (!strchr(" \t>|:#", *cbuf))
+ printf("%d [", pos);
+ for (i = pos; i < tlen; i++) {
+ GET_CHAR(i, cbuf, clen);
+ if (clen < 0) break;
+ if (breakoncr && clen == 1 && cbuf[0] == '\n')
break;
- indent_len++;
+ fwrite(cbuf, clen, 1, stdout);
}
+ printf("]\n");
+}
+#endif
+
+typedef enum {
+ WAIT_FOR_SPACE,
+ WAIT_FOR_INDENT_CHAR,
+ WAIT_FOR_INDENT_CHAR_OR_SPACE
+} IndentState;
+
+/* return indent length, we allow:
+ > followed by spaces/tabs
+ | followed by spaces/tabs
+ uppercase characters immediately followed by >,
+ and the repeating sequences of the above */
+/* return indent length */
+static guint get_indent_length(GtkSText *text, guint start_pos, guint text_len)
+{
+ guint i_len = 0;
+ guint i, ch_len, alnum_cnt = 0;
+ IndentState state = WAIT_FOR_INDENT_CHAR;
+ gchar cbuf[MB_LEN_MAX];
+ gboolean is_space;
+ gboolean is_indent;
+
+ for (i = start_pos; i < text_len; i++) {
+ GET_CHAR(i, cbuf, ch_len);
+ if (ch_len > 1)
+ break;
+
+ if (cbuf[0] == '\n')
+ break;
+
+ is_indent = strchr(prefs_common.quote_chars, cbuf[0]) ? TRUE : FALSE;
+ is_space = strchr(SPACE_CHARS, cbuf[0]) ? TRUE : FALSE;
+
+ switch (state) {
+ case WAIT_FOR_SPACE:
+ if (is_space == FALSE)
+ goto out;
+ state = WAIT_FOR_INDENT_CHAR_OR_SPACE;
+ break;
+ case WAIT_FOR_INDENT_CHAR_OR_SPACE:
+ if (is_indent == FALSE && is_space == FALSE &&
+ !isupper(cbuf[0]))
+ goto out;
+ if (is_space == TRUE) {
+ alnum_cnt = 0;
+ state = WAIT_FOR_INDENT_CHAR_OR_SPACE;
+ } else if (is_indent == TRUE) {
+ alnum_cnt = 0;
+ state = WAIT_FOR_SPACE;
+ } else {
+ alnum_cnt++;
+ state = WAIT_FOR_INDENT_CHAR;
+ }
+ break;
+ case WAIT_FOR_INDENT_CHAR:
+ if (is_indent == FALSE && !isupper(cbuf[0]))
+ goto out;
+ if (is_indent == TRUE) {
+ if (alnum_cnt > 0
+ && !strchr(prefs_common.quote_chars, cbuf[0]))
+ goto out;
+ alnum_cnt = 0;
+ state = WAIT_FOR_SPACE;
+ } else {
+ alnum_cnt++;
+ }
+ break;
+ }
+
+ i_len++;
+ }
+
+out:
+ if ((i_len > 0) && (state == WAIT_FOR_INDENT_CHAR))
+ i_len -= alnum_cnt;
- return indent_len;
+ return i_len;
}
/* insert quotation string when line was wrapped */
-static guint ins_quote(GtkSText *text, guint quote_len, guint indent_len,
+static guint ins_quote(GtkSText *text, guint indent_len,
guint prev_line_pos, guint text_len,
gchar *quote_fmt)
{
- guint i, ins_len;
+ guint i, ins_len = 0;
gchar ch;
if (indent_len) {
gtk_stext_insert(text, NULL, NULL, NULL, &ch, 1);
}
ins_len = indent_len;
- } else {
- gtk_stext_insert(text, NULL, NULL, NULL, quote_fmt, quote_len);
- ins_len = quote_len;
}
return ins_len;
}
-#undef WRAP_DEBUG
-#ifdef WRAP_DEBUG
-/* Darko: used when I debug wrapping */
-void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
+/* check if we should join the next line */
+static gboolean join_next_line(GtkSText *text, guint start_pos, guint tlen,
+ guint prev_ilen, gboolean autowrap)
{
- gint i;
- gchar ch;
+ guint indent_len, ch_len;
+ gboolean do_join = FALSE;
+ gchar cbuf[MB_LEN_MAX];
- printf("%d [", pos);
- for (i = pos; i < tlen; i++) {
- ch = GTK_STEXT_INDEX(text, i);
- if (breakoncr && ch == '\n')
- break;
- printf("%c", ch);
+ indent_len = get_indent_length(text, start_pos, tlen);
+
+ if ((autowrap || indent_len > 0) && indent_len == prev_ilen) {
+ GET_CHAR(start_pos + indent_len, cbuf, ch_len);
+ if (ch_len > 0 && (cbuf[0] != '\n'))
+ do_join = TRUE;
}
- printf("]\n");
+
+ return do_join;
}
-#endif
static void compose_wrap_line_all(Compose *compose)
+{
+ compose_wrap_line_all_full(compose, FALSE);
+}
+
+#define STEXT_FREEZE() \
+ if (!frozen) { gtk_stext_freeze(text); frozen = TRUE; }
+
+static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
{
GtkSText *text = GTK_STEXT(compose->text);
guint tlen;
gint line_len = 0, cur_len = 0;
gint ch_len;
gboolean is_new_line = TRUE, do_delete = FALSE;
- guint qlen = 0, i_len = 0;
+ guint i_len = 0;
gboolean linewrap_quote = TRUE;
+ gboolean set_editable_pos = FALSE;
+ gint editable_pos = 0;
+ gboolean frozen = FALSE;
guint linewrap_len = prefs_common.linewrap_len;
gchar *qfmt = prefs_common.quotemark;
gchar cbuf[MB_LEN_MAX];
- gtk_stext_freeze(text);
-
- /* make text buffer contiguous */
- /* gtk_stext_compact_buffer(text); */
-
tlen = gtk_stext_get_length(text);
for (; cur_pos < tlen; cur_pos++) {
/* mark position of new line - needed for quotation wrap */
if (is_new_line) {
- if (linewrap_quote) {
- qlen = gtkut_stext_str_compare
- (text, cur_pos, tlen, qfmt);
- if (qlen)
- i_len = get_indent_length
- (text, cur_pos, tlen);
- else
- i_len = 0;
- }
+ if (linewrap_quote)
+ i_len = get_indent_length(text, cur_pos, tlen);
+
is_new_line = FALSE;
p_pos = cur_pos;
#ifdef WRAP_DEBUG
- printf("new line i_len=%d qlen=%d p_pos=", i_len, qlen);
+ g_print("new line i_len=%d p_pos=", i_len);
dump_text(text, p_pos, tlen, 1);
#endif
}
guint tab_offset = line_len % tab_width;
#ifdef WRAP_DEBUG
- printf("found tab at pos=%d line_len=%d ", cur_pos,
+ g_print("found tab at pos=%d line_len=%d ", cur_pos,
line_len);
#endif
if (tab_offset) {
/* we have encountered line break */
if (ch_len == 1 && *cbuf == '\n') {
gint clen;
- guint ilen;
- gchar cb[MB_CUR_MAX];
+ gchar cb[MB_LEN_MAX];
+
+ /* should we join the next line */
+ if ((autowrap || i_len != cur_len) && do_delete &&
+ join_next_line
+ (text, cur_pos + 1, tlen, i_len, autowrap))
+ do_delete = TRUE;
+ else
+ do_delete = FALSE;
#ifdef WRAP_DEBUG
- printf("found CR at %d next line is ", cur_pos);
+ g_print("found CR at %d do_del is %d next line is ",
+ cur_pos, do_delete);
dump_text(text, cur_pos + 1, tlen, 1);
#endif
- /* if it's just quotation + newline skip it */
- if (i_len && (cur_pos + 1 < tlen)) {
- /* check if text at new line matches indent */
- ilen = gtkut_stext_str_compare_n
- (text, cur_pos + 1, p_pos, i_len, tlen);
- if (cur_pos + ilen < tlen) {
- GET_CHAR(cur_pos + ilen + 1, cb, clen);
- /* no need to join the lines */
- if (clen == 1 && cb[0] == '\n')
- do_delete = FALSE;
- }
- /* if it's just newline skip it */
- } else if (do_delete && (cur_pos + 1 < tlen)) {
- GET_CHAR(cur_pos + 1, cb, clen);
- /* no need to join the lines */
- if (clen == 1 && cb[0] == '\n')
- do_delete = FALSE;
- }
/* skip delete if it is continuous URL */
if (do_delete && (line_pos - p_pos <= i_len) &&
do_delete = FALSE;
#ifdef WRAP_DEBUG
- printf("qlen=%d l_len=%d wrap_len=%d do_del=%d\n",
- qlen, line_len, linewrap_len, do_delete);
+ g_print("l_len=%d wrap_len=%d do_del=%d\n",
+ line_len, linewrap_len, do_delete);
#endif
/* should we delete to perform smart wrapping */
if (line_len < linewrap_len && do_delete) {
+ STEXT_FREEZE();
/* get rid of newline */
gtk_stext_set_point(text, cur_pos);
gtk_stext_forward_delete(text, 1);
/* if text starts with quote fmt or with
indent string, delete them */
if (i_len) {
+ guint ilen;
ilen = gtkut_stext_str_compare_n
(text, cur_pos, p_pos, i_len,
tlen);
(text, ilen);
tlen -= ilen;
}
- } else if (qlen) {
- if (gtkut_stext_str_compare
- (text, cur_pos, tlen, qfmt)) {
- gtk_stext_forward_delete
- (text, qlen);
- tlen -= qlen;
- }
}
GET_CHAR(cur_pos, cb, clen);
((clen > 1) || isalnum(cb[0]))) {
gtk_stext_insert(text, NULL, NULL,
NULL, " ", 1);
- /* gtk_stext_compact_buffer(text); */
tlen++;
}
cur_pos = p_pos - 1;
line_pos = cur_pos;
line_len = cur_len = 0;
- qlen = 0;
do_delete = FALSE;
is_new_line = TRUE;
#ifdef WRAP_DEBUG
- printf("after delete l_pos=");
+ g_print("after delete l_pos=");
dump_text(text, line_pos, tlen, 1);
#endif
continue;
/* mark new line beginning */
line_pos = cur_pos + 1;
line_len = cur_len = 0;
- qlen = 0;
do_delete = FALSE;
is_new_line = TRUE;
continue;
gint clen;
#ifdef WRAP_DEBUG
- printf("should wrap cur_pos=%d ", cur_pos);
+ g_print("should wrap cur_pos=%d ", cur_pos);
dump_text(text, p_pos, tlen, 1);
dump_text(text, line_pos, tlen, 1);
#endif
(text, line_pos, tlen))
line_pos = cur_pos - 1;
#ifdef WRAP_DEBUG
- printf("new line_pos=%d\n", line_pos);
+ g_print("new line_pos=%d\n", line_pos);
#endif
GET_CHAR(line_pos - 1, cbuf, clen);
/* if next character is space delete it */
- if (clen == 1 && isspace(*cbuf)) {
+ if (clen == 1 && isspace(*cbuf)) {
if (p_pos + i_len != line_pos ||
!gtkut_stext_is_uri_string
(text, line_pos, tlen)) {
+ STEXT_FREEZE();
+ /* workaround for correct cursor
+ position */
+ if (set_editable_pos == FALSE) {
+ editable_pos = gtk_editable_get_position(GTK_EDITABLE(text));
+ if (editable_pos == line_pos)
+ set_editable_pos = TRUE;
+ }
gtk_stext_set_point(text, line_pos);
gtk_stext_backward_delete(text, 1);
tlen--;
if (p_pos + i_len == line_pos &&
gtkut_stext_is_uri_string(text, line_pos, tlen)) {
#ifdef WRAP_DEBUG
- printf("found URL at ");
+ g_print("found URL at ");
dump_text(text, line_pos, tlen, 1);
#endif
continue;
}
/* insert CR */
+ STEXT_FREEZE();
gtk_stext_set_point(text, line_pos);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
/* gtk_stext_compact_buffer(text); */
cur_pos = line_pos - 1;
/* start over with current line */
is_new_line = TRUE;
- line_len = 0;
- cur_len = 0;
- do_delete = TRUE;
+ line_len = cur_len = 0;
+ if (autowrap || i_len > 0)
+ do_delete = TRUE;
+ else
+ do_delete = FALSE;
#ifdef WRAP_DEBUG
- printf("after CR insert ");
+ g_print("after CR insert ");
dump_text(text, line_pos, tlen, 1);
dump_text(text, cur_pos, tlen, 1);
#endif
/* should we insert quotation ? */
- if (linewrap_quote && qlen) {
+ if (linewrap_quote && i_len) {
/* only if line is not already quoted */
if (!gtkut_stext_str_compare
(text, line_pos, tlen, qfmt)) {
if (line_pos - p_pos > i_len) {
ins_len = ins_quote
- (text, qlen, i_len,
- p_pos, tlen, qfmt);
-
- /* gtk_stext_compact_buffer(text); */
+ (text, i_len, p_pos,
+ tlen, qfmt);
tlen += ins_len;
}
#ifdef WRAP_DEBUG
- printf("after quote insert ");
+ g_print("after quote insert ");
dump_text(text, line_pos, tlen, 1);
#endif
}
cur_len += ch_len;
}
- gtk_stext_thaw(text);
+ if (frozen)
+ gtk_stext_thaw(text);
+
+ if (set_editable_pos && editable_pos <= tlen)
+ gtk_editable_set_position(GTK_EDITABLE(text), editable_pos);
}
+#undef STEXT_FREEZE
#undef GET_CHAR
static void compose_set_title(Compose *compose)
return ac;
}
+static void compose_select_account(Compose *compose, PrefsAccount *account)
+{
+ GtkWidget *menuitem;
+ GtkItemFactory *ifactory;
+
+ g_return_if_fail(account != NULL);
+
+ compose->account = account;
+
+ compose_set_title(compose);
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+#if 0
+ if (account->protocol == A_NNTP) {
+ gtk_widget_show(compose->newsgroups_hbox);
+ gtk_widget_show(compose->newsgroups_entry);
+ gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
+ compose->use_newsgroups = TRUE;
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ gtk_widget_set_sensitive(menuitem, TRUE);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ gtk_widget_set_sensitive(menuitem, TRUE);
+
+ menu_set_sensitive(ifactory, "/View/Followup to", TRUE);
+ } else {
+ gtk_widget_hide(compose->newsgroups_hbox);
+ gtk_widget_hide(compose->newsgroups_entry);
+ gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 0);
+ gtk_widget_queue_resize(compose->table_vbox);
+ compose->use_newsgroups = FALSE;
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ gtk_widget_set_sensitive(menuitem, FALSE);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ gtk_widget_set_sensitive(menuitem, FALSE);
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Followup to");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+ gtk_widget_set_sensitive(menuitem, FALSE);
+ }
+
+ if (account->set_autocc && account->auto_cc &&
+ compose->mode != COMPOSE_REEDIT) {
+ gtk_entry_set_text
+ (GTK_ENTRY(compose->cc_entry), account->auto_cc);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ }
+ if (account->set_autobcc) {
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ if (account->auto_bcc && compose->mode != COMPOSE_REEDIT)
+ gtk_entry_set_text(GTK_ENTRY(compose->bcc_entry),
+ account->auto_bcc);
+ }
+ if (account->set_autoreplyto) {
+ menuitem = gtk_item_factory_get_item(ifactory,
+ "/View/Reply to");
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ if (account->auto_replyto && compose->mode != COMPOSE_REEDIT)
+ gtk_entry_set_text(GTK_ENTRY(compose->reply_entry),
+ account->auto_replyto);
+ }
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ prefs_common.show_ruler);
+#endif
+
+#if USE_GPGME
+ menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ account->default_sign);
+ menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ account->default_encrypt);
+
+ activate_gnupg_mode(compose, account);
+#endif /* USE_GPGME */
+}
+
gboolean compose_check_for_valid_recipient(Compose *compose) {
gchar *recipient_headers_mail[] = {"To:", "Cc:", "Bcc:", NULL};
gchar *recipient_headers_news[] = {"Newsgroups:", NULL};
compose->newsgroup_list = NULL;
/* search header entries for to and newsgroup entries */
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
- header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->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 (entry[0] != '\0') {
+ for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
+ if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *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))) {
+ for (strptr = recipient_headers_news; *strptr != NULL; strptr++) {
+ if (!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
recipient_found = TRUE;
}
}
}
+ g_free(header);
g_free(entry);
}
return recipient_found;
}
-static gboolean compose_check_entries(Compose *compose)
+static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
{
gchar *str;
}
str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str == '\0') {
+ if (*str == '\0' && check_subject == TRUE) {
AlertValue aval;
aval = alertpanel(_("Send"),
gint msgnum;
FolderItem *folder;
gint val;
+ gchar *msgpath;
- if (compose_check_entries(compose) == FALSE)
+ if (compose_check_entries(compose, TRUE) == FALSE)
return -1;
val = compose_queue(compose, &msgnum, &folder);
return -1;
}
- val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
+ msgpath = folder_item_fetch_msg(folder, msgnum);
+ val = procmsg_send_message_queue(msgpath);
+ g_free(msgpath);
folder_item_remove_msg(folder, msgnum);
- folderview_update_item(folder, TRUE);
+ folder_update_item(folder, TRUE);
return val;
}
if (lock) return 1;
g_return_val_if_fail(compose->account != NULL, -1);
- g_return_val_if_fail(compose->orig_account != NULL, -1);
lock = TRUE;
- if (compose_check_entries(compose) == FALSE) {
+ if (compose_check_entries(compose, TRUE) == FALSE) {
lock = FALSE;
return 1;
}
/* write to temporary file */
- g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%d",
- get_rc_dir(), G_DIR_SEPARATOR, (gint)compose);
+ g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%08x",
+ get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
if (prefs_common.linewrap_at_send)
compose_wrap_line_all(compose);
#if 0 /* NEW COMPOSE GUI */
if (compose->account->protocol != A_NNTP)
ac = compose->account;
- else if (compose->orig_account->protocol != A_NNTP)
- ac = compose->orig_account;
- else if (cur_account && cur_account->protocol != A_NNTP)
- ac = cur_account;
else {
- ac = compose_current_mail_account();
+ ac = account_find_from_address(compose->account->address);
if (!ac) {
+ if (cur_account && cur_account->protocol != A_NNTP)
+ ac = cur_account;
+ else
+ ac = account_get_default();
+ }
+ if (!ac || ac->protocol == A_NNTP) {
+ alertpanel_error(_("Account for sending mail is not specified.\n"
+ "Please select a mail account before sending."));
unlink(tmp);
lock = FALSE;
return -1;
}
if (ok == 0 && compose->newsgroup_list) {
- Folder *folder;
-
- if (compose->account->protocol == A_NNTP)
- folder = FOLDER(compose->account->folder);
- else
- folder = FOLDER(compose->orig_account->folder);
-
- ok = news_post(folder, tmp);
+ ok = news_post(FOLDER(compose->account->folder), tmp);
if (ok < 0) {
alertpanel_error(_("Error occurred while posting the message to %s ."),
compose->account->nntp_server);
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
if (compose->targetinfo)
- folderview_update_item
+ folder_update_item
(compose->targetinfo->folder, TRUE);
}
/* save message to outbox */
if (prefs_common.savemsg) {
- Folder *folder = FOLDER(compose->account->folder);
- FolderItem *outbox = NULL;
+ FolderItem *outbox;
- if (folder)
- outbox = folder->outbox;
+ outbox = account_get_special_folder
+ (compose->account, F_OUTBOX);
if (procmsg_save_to_outbox(outbox, tmp, FALSE) < 0)
alertpanel_error
- (_("Can't save the message to outbox."));
+ (_("Can't save the message to Sent."));
+ else
+ folder_update_item(outbox, TRUE);
}
}
return(gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL);
}
-static gint compose_bounce_write_headers_from_headerlist(Compose *compose,
- FILE *fp)
+static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
+ FILE *fp)
{
gchar buf[BUFFSIZE];
gchar *str;
GSList *list;
ComposeHeaderEntry *headerentry;
gchar *headerentryname;
- gchar *header_w_colon;
gchar *cc_hdr;
gchar *to_hdr;
- debug_print(_("Writing bounce header\n"));
+ debug_print("Writing redirect header\n");
+
+ cc_hdr = prefs_common.trans_hdr ? _("Cc:") : "Cc:";
+ to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
- header_w_colon = g_strconcat("To:", NULL);
- to_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
- header_w_colon = g_strconcat("Cc:", NULL);
- cc_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
-
first_address = TRUE;
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if(g_strcasecmp(headerentryname, cc_hdr) == 0
+ if (g_strcasecmp(headerentryname, cc_hdr) == 0
|| g_strcasecmp(headerentryname, to_hdr) == 0) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(str[0] != '\0') {
+ if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen("Resent-To") + 2);
- if(first_address) {
+ if (first_address) {
fprintf(fp, "Resent-To: ");
first_address = FALSE;
} else {
}
}
}
- /* if(!first_address) { */
+ /* if (!first_address) { */
fprintf(fp, "\n");
/* } */
return(0);
}
-static gint compose_bounce_write_headers(Compose *compose, FILE *fp)
+static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
{
gchar buf[BUFFSIZE];
gchar *str;
g_return_val_if_fail(compose->account != NULL, -1);
g_return_val_if_fail(compose->account->address != NULL, -1);
- /* Date */
+ /* Resent-Date */
get_rfc822_date(buf, sizeof(buf));
fprintf(fp, "Resent-Date: %s\n", buf);
- /* From */
+ /* Resent-From */
if (compose->account->name && *compose->account->name) {
compose_convert_header
(buf, sizeof(buf), compose->account->name,
} else
fprintf(fp, "Resent-From: %s\n", compose->account->address);
- /* To */
- compose_bounce_write_headers_from_headerlist(compose, fp);
+ /* Subject */
+ str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ if (*str != '\0') {
+ Xstrdup_a(str, str, return -1);
+ g_strstrip(str);
+ if (*str != '\0') {
+ compose_convert_header(buf, sizeof(buf), str,
+ strlen("Subject: "));
+ fprintf(fp, "Subject: %s\n", buf);
+ }
+ }
+
+ /* Resent-Message-ID */
+ if (compose->account->gen_msgid) {
+ compose_generate_msgid(compose, buf, sizeof(buf));
+ fprintf(fp, "Resent-Message-Id: <%s>\n", buf);
+ compose->msgid = g_strdup(buf);
+ }
+
+ compose_redirect_write_headers_from_headerlist(compose, fp);
/* separator between header and body */
fputs("\n", fp);
return 0;
}
-static gint compose_bounce_write_to_file(Compose *compose, const gchar *file)
+static gint compose_redirect_write_to_file(Compose *compose, const gchar *file)
{
FILE *fp;
FILE *fdest;
size_t len;
gchar buf[BUFFSIZE];
- if ((fp = fopen(compose->bounce_filename, "rb")) == NULL) {
+ if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
while (procheader_get_unfolded_line(buf, sizeof(buf), fp)) {
/* should filter returnpath, delivered-to */
- if ((g_strncasecmp(buf, "Return-Path:",
- strlen("Return-Path:")) == 0)
- || (g_strncasecmp(buf, "Delivered-To:",
- strlen("Delivered-To:")) == 0))
+ if (g_strncasecmp(buf, "Return-Path:",
+ strlen("Return-Path:")) == 0 ||
+ g_strncasecmp(buf, "Delivered-To:",
+ strlen("Delivered-To:")) == 0 ||
+ g_strncasecmp(buf, "Received:",
+ strlen("Received:")) == 0 ||
+ g_strncasecmp(buf, "Subject:",
+ strlen("Subject:")) == 0 ||
+ g_strncasecmp(buf, "X-UIDL:",
+ strlen("X-UIDL:")) == 0)
continue;
if (fputs(buf, fdest) == -1)
goto error;
- if (!prefs_common.bounce_keep_from) {
+ if (!prefs_common.redirect_keep_from) {
if (g_strncasecmp(buf, "From:",
strlen("From:")) == 0) {
fputs(" (by way of ", fdest);
goto error;
}
- compose_bounce_write_headers(compose, fdest);
+ compose_redirect_write_headers(compose, fdest);
- while ((len = fread(buf, sizeof(gchar), BUFFSIZE, fp)) > 0) {
- if (fwrite(buf, sizeof(gchar), len, fdest) == -1)
+ while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
+ if (fwrite(buf, sizeof(gchar), len, fdest) != len) {
+ FILE_OP_ERROR(file, "fwrite");
goto error;
+ }
}
- fclose(fdest);
fclose(fp);
+ if (fclose(fdest) == EOF) {
+ FILE_OP_ERROR(file, "fclose");
+ unlink(file);
+ return -1;
+ }
return 0;
error:
- fclose(fdest);
fclose(fp);
+ fclose(fdest);
+ unlink(file);
return -1;
}
-#ifdef USE_GPGME
-/*
- * interfaces to rfc2015 to keep out the prefs stuff there.
+#if USE_GPGME
+/* interfaces to rfc2015 to keep out the prefs stuff there.
* returns 0 on success and -1 on error. */
-static int compose_create_signers_list (Compose *compose, GSList **pkey_list)
+static gint compose_create_signers_list(Compose *compose, GSList **pkey_list)
{
- const char *keyid = NULL;
+ const gchar *key_id = NULL;
GSList *key_list;
switch (compose->account->sign_key) {
case SIGN_KEY_DEFAULT:
*pkey_list = NULL;
- return 0; /* nothing to do */
-
+ return 0;
case SIGN_KEY_BY_FROM:
- keyid = compose->account->address;
+ key_id = compose->account->address;
break;
-
case SIGN_KEY_CUSTOM:
- keyid = compose->account->sign_key_id;
+ key_id = compose->account->sign_key_id;
break;
-
default:
- g_assert_not_reached ();
+ break;
}
- key_list = rfc2015_create_signers_list(keyid);
+ key_list = rfc2015_create_signers_list(key_id);
if (!key_list) {
- alertpanel_error("Could not find any key associated with currently "
- "selected keyid `%s'!", keyid);
- return -1;
+ alertpanel_error(_("Could not find any key associated with "
+ "currently selected key id `%s'."), key_id);
+ return -1;
}
-
+
*pkey_list = key_list;
return 0;
}
+
+/* clearsign message body text */
+static gint compose_clearsign_text(Compose *compose, gchar **text)
+{
+ GSList *key_list;
+ gchar *tmp_file;
+
+ tmp_file = get_tmp_file();
+ if (str_write_to_file(*text, tmp_file) < 0) {
+ g_free(tmp_file);
+ return -1;
+ }
+
+ if (canonicalize_file_replace(tmp_file) < 0 ||
+ compose_create_signers_list(compose, &key_list) < 0 ||
+ rfc2015_clearsign(tmp_file, key_list) < 0) {
+ unlink(tmp_file);
+ g_free(tmp_file);
+ return -1;
+ }
+
+ g_free(*text);
+ *text = file_read_to_str(tmp_file);
+ unlink(tmp_file);
+ g_free(tmp_file);
+ if (*text == NULL)
+ return -1;
+
+ return 0;
+}
#endif /* USE_GPGME */
static gint compose_write_to_file(Compose *compose, const gchar *file,
chars = gtk_editable_get_chars(GTK_EDITABLE(compose->text), 0, -1);
len = strlen(chars);
if (is_ascii_str(chars)) {
- buf = g_strdup(chars);
+ buf = chars;
+ chars = NULL;
out_codeset = CS_US_ASCII;
encoding = ENC_7BIT;
} else {
out_codeset = CS_ISO_8859_1;
encoding = procmime_get_encoding_for_charset(out_codeset);
+#if USE_GPGME
+ if (!is_draft &&
+ compose->use_signing && !compose->gnupg_mode &&
+ encoding == ENC_8BIT)
+ encoding = ENC_BASE64;
+#endif
+
src_codeset = conv_get_current_charset_str();
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
unlink(file);
return -1;
} else {
- buf = g_strdup(chars);
+ buf = chars;
+ chars = NULL;
}
}
}
g_free(chars);
+ /* Canonicalize line endings in the message text */
+ {
+ gchar *canon_buf, *out;
+ const gchar *p;
+ guint new_len = 0;
+
+ for (p = buf ; *p; ++p) {
+ if (*p != '\r') {
+ ++new_len;
+ if (*p == '\n')
+ ++new_len;
+ }
+ }
+
+ out = canon_buf = g_new(gchar, new_len + 1);
+ for (p = buf; *p; ++p) {
+ if (*p != '\r') {
+ if (*p == '\n')
+ *out++ = '\r';
+ *out++ = *p;
+ }
+ }
+ *out = '\0';
+
+ free(buf);
+ buf = canon_buf;
+ }
+
+#if USE_GPGME
+ if (!is_draft && compose->use_signing && compose->gnupg_mode) {
+ if (compose_clearsign_text(compose, &buf) < 0) {
+ g_warning("clearsign failed\n");
+ fclose(fp);
+ unlink(file);
+ g_free(buf);
+ return -1;
+ }
+ }
+#endif
+
/* write headers */
if (compose_write_headers
(compose, fp, out_codeset, encoding, is_draft) < 0) {
for (i = 0; i < len; i += B64_LINE_SIZE) {
l = MIN(B64_LINE_SIZE, len - i);
- to64frombits(outbuf, buf + i, l);
+ base64_encode(outbuf, buf + i, l);
fputs(outbuf, fp);
fputc('\n', fp);
}
}
#if USE_GPGME
- if (compose->use_signing) {
+ if (is_draft)
+ return 0;
+
+ if ((compose->use_signing && !compose->gnupg_mode) ||
+ compose->use_encryption) {
+ if (canonicalize_file_replace(file) < 0) {
+ unlink(file);
+ return -1;
+ }
+ }
+
+ if (compose->use_signing && !compose->gnupg_mode) {
GSList *key_list;
-
- if (compose_create_signers_list(compose, &key_list) == -1 ||
- rfc2015_sign(file, key_list) < 0) {
-
+
+ if (compose_create_signers_list(compose, &key_list) < 0 ||
+ rfc2015_sign(file, key_list) < 0) {
unlink(file);
return -1;
}
}
if (compose->use_encryption) {
- if (rfc2015_encrypt(file, compose->to_list, compose->account->ascii_armored) < 0) {
+ if (rfc2015_encrypt(file, compose->to_list,
+ compose->gnupg_mode) < 0) {
unlink(file);
return -1;
}
item = msginfo->folder;
g_return_val_if_fail(item != NULL, -1);
- folder_item_scan(item);
if (procmsg_msg_exist(msginfo) &&
(item->stype == F_DRAFT || item->stype == F_QUEUE)) {
if (folder_item_remove_msg(item, msginfo->msgnum) < 0) {
return 0;
}
+void compose_remove_draft(Compose *compose)
+{
+ FolderItem *drafts;
+ MsgInfo *msginfo = compose->targetinfo;
+ drafts = account_get_special_folder(compose->account, F_DRAFT);
+
+ if (procmsg_msg_exist(msginfo)) {
+ folder_item_remove_msg(drafts, msginfo->msgnum);
+ folder_update_item(drafts, TRUE);
+ }
+
+}
static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
+{
+ return compose_queue_sub (compose, msgnum, item, FALSE);
+}
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
{
FolderItem *queue;
- gchar *tmp, *tmp2, *queue_path;
+ gchar *tmp, *tmp2;
FILE *fp, *src_fp;
GSList *cur;
gchar buf[BUFFSIZE];
static gboolean lock = FALSE;
PrefsAccount *mailac = NULL, *newsac = NULL;
- debug_print(_("queueing message...\n"));
+ debug_print("queueing message...\n");
g_return_val_if_fail(compose->account != NULL, -1);
- g_return_val_if_fail(compose->orig_account != NULL, -1);
lock = TRUE;
- if (compose_check_entries(compose) == FALSE) {
+ if (compose_check_entries(compose, check_subject) == FALSE) {
lock = FALSE;
return -1;
}
return -1;
}
- if(compose->to_list) {
+ if (compose->to_list) {
if (compose->account->protocol != A_NNTP)
mailac = compose->account;
- else if (compose->orig_account->protocol != A_NNTP)
- mailac = compose->orig_account;
else if (cur_account && cur_account->protocol != A_NNTP)
mailac = cur_account;
else if (!(mailac = compose_current_mail_account())) {
}
}
- if(compose->newsgroup_list) {
+ if (compose->newsgroup_list) {
if (compose->account->protocol == A_NNTP)
newsac = compose->account;
- else if(!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
+ else if (!newsac->protocol != A_NNTP) {
lock = FALSE;
alertpanel_error(_("No account for posting news available!"));
return -1;
tmp2 = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
G_DIR_SEPARATOR, (gint)compose);
- if (compose->bounce_filename != NULL) {
- if (compose_bounce_write_to_file(compose, tmp2) < 0) {
+ if (compose->redirect_filename != NULL) {
+ if (compose_redirect_write_to_file(compose, tmp2) < 0) {
unlink(tmp2);
lock = FALSE;
return -1;
fprintf(fp, "NSV:\n");
fprintf(fp, "SSH:\n");
/* write recepient list */
- fprintf(fp, "R:");
- if(compose->to_list) {
- fprintf(fp, "<%s>", (gchar *)compose->to_list->data);
- for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
+ if (compose->to_list) {
+ fprintf(fp, "R:<%s>", (gchar *)compose->to_list->data);
+ for (cur = compose->to_list->next; cur != NULL;
+ cur = cur->next)
fprintf(fp, ",<%s>", (gchar *)cur->data);
+ fprintf(fp, "\n");
}
- fprintf(fp, "\n");
/* write newsgroup list */
- fprintf(fp, "NG:");
- if(compose->newsgroup_list) {
+ if (compose->newsgroup_list) {
+ fprintf(fp, "NG:");
fprintf(fp, "%s", (gchar *)compose->newsgroup_list->data);
for (cur = compose->newsgroup_list->next; cur != NULL; cur = cur->next)
fprintf(fp, ",%s", (gchar *)cur->data);
+ fprintf(fp, "\n");
}
- fprintf(fp, "\n");
/* Sylpheed account IDs */
- if(mailac) {
+ if (mailac) {
fprintf(fp, "MAID:%d\n", mailac->account_id);
}
- if(newsac) {
+ if (newsac) {
fprintf(fp, "NAID:%d\n", newsac->account_id);
}
/* Save copy folder */
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
- gchar *str;
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ gchar *savefolderid;
+
+ savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ fprintf(fp, "SCF:%s\n", savefolderid);
+ g_free(savefolderid);
+ }
+ /* Message-ID of message replying to */
+ if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
+ gchar *folderid;
- str = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
- fprintf(fp, "SCF:%s\n", str);
- g_free(str);
+ folderid = folder_item_get_identifier(compose->replyinfo->folder);
+ fprintf(fp, "RMID:%s\x7f%d\x7f%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid);
+ g_free(folderid);
}
fprintf(fp, "\n");
return -1;
}
- if (compose->account->folder &&
- FOLDER(compose->account->folder)->queue)
- queue = FOLDER(compose->account->folder)->queue;
- else
- queue = folder_get_default_queue();
-
+ queue = account_get_special_folder(compose->account, F_QUEUE);
+ if (!queue) {
+ g_warning(_("can't find queue folder\n"));
+ unlink(tmp);
+ g_free(tmp);
+ return -1;
+ }
folder_item_scan(queue);
- queue_path = folder_item_get_path(queue);
- if (!is_dir_exist(queue_path))
- make_dir_hier(queue_path);
if ((num = folder_item_add_msg(queue, tmp, TRUE)) < 0) {
g_warning(_("can't queue the message\n"));
unlink(tmp);
g_free(tmp);
- g_free(queue_path);
return -1;
}
unlink(tmp);
compose_remove_reedit_target(compose);
if (compose->targetinfo &&
compose->targetinfo->folder != queue)
- folderview_update_item
+ folder_update_item
(compose->targetinfo->folder, TRUE);
}
- if ((fp = procmsg_open_mark_file(queue_path, TRUE)) == NULL)
- g_warning(_("can't open mark file\n"));
- else {
- MsgInfo newmsginfo;
+ folder_update_item(queue, TRUE);
- newmsginfo.msgnum = num;
- newmsginfo.flags.perm_flags = 0;
- newmsginfo.flags.tmp_flags = 0;
- procmsg_write_flags(&newmsginfo, fp);
- fclose(fp);
- }
- g_free(queue_path);
-
- folder_item_scan(queue);
- folderview_update_item(queue, TRUE);
-
- if((msgnum != NULL) && (item != NULL)) {
+ if ((msgnum != NULL) && (item != NULL)) {
*msgnum = num;
*item = queue;
}
while ((len = fread(inbuf, sizeof(gchar),
B64_LINE_SIZE, attach_fp))
== B64_LINE_SIZE) {
- to64frombits(outbuf, inbuf, B64_LINE_SIZE);
+ base64_encode(outbuf, inbuf, B64_LINE_SIZE);
fputs(outbuf, fp);
fputc('\n', fp);
}
if (len > 0 && feof(attach_fp)) {
- to64frombits(outbuf, inbuf, len);
+ base64_encode(outbuf, inbuf, len);
fputs(outbuf, fp);
fputc('\n', fp);
}
break;
+ default:
+ debug_print("Tried to write attachment in unsupported encoding type\n");
+ break;
}
fclose(attach_fp);
fprintf(fp, "\n--%s--\n", compose->boundary);
}
+#define QUOTE_IF_REQUIRED(out, str) \
+{ \
+ if (*str != '"' && (strchr(str, ',') \
+ || strchr(str, '.'))) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ Xalloca(__tmp, len, return -1); \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ Xstrdup_a(out, str, return -1); \
+ } \
+}
+
+#define PUT_RECIPIENT_HEADER(header, str) \
+{ \
+ if (*str != '\0') { \
+ Xstrdup_a(str, str, return -1); \
+ g_strstrip(str); \
+ if (*str != '\0') { \
+ compose->to_list = address_list_append \
+ (compose->to_list, str); \
+ compose_convert_header \
+ (buf, sizeof(buf), str, strlen(header) + 2); \
+ fprintf(fp, "%s: %s\n", header, buf); \
+ } \
+ } \
+}
+
#define IS_IN_CUSTOM_HEADER(header) \
(compose->account->add_customhdr && \
custom_header_find(compose->account->customhdr_list, header) != NULL)
return 0;
}
- debug_print(_("Writing %s-header\n"), header);
+ debug_print("Writing %s-header\n", header);
header_w_colon = g_strconcat(header, ":", NULL);
trans_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
first_address = TRUE;
- for(list = compose->header_list; list; list = list->next) {
+ for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if(!g_strcasecmp(trans_hdr, headerentryname)) {
+ if (!g_strcasecmp(trans_hdr, headerentryname)) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(str[0] != '\0') {
+ if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen(header) + 2);
- if(first_address) {
+ if (first_address) {
fprintf(fp, "%s: ", header);
first_address = FALSE;
} else {
}
}
}
- if(!first_address) {
+ if (!first_address) {
fprintf(fp, "\n");
}
{
gchar buf[BUFFSIZE];
gchar *str;
+ gchar *name;
+ GSList *list;
+ gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
+
/* struct utsname utsbuf; */
g_return_val_if_fail(fp != NULL, -1);
g_return_val_if_fail(compose->account != NULL, -1);
g_return_val_if_fail(compose->account->address != NULL, -1);
+ /* Save draft infos */
+ if (is_draft) {
+ fprintf(fp, "S:%s\n", compose->account->address);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ gchar *savefolderid;
+
+ savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ fprintf(fp, "SCF:%s\n", savefolderid);
+ g_free(savefolderid);
+ }
+ fprintf(fp, "\n");
+ }
+
/* Date */
if (compose->account->add_date) {
get_rfc822_date(buf, sizeof(buf));
compose_convert_header
(buf, sizeof(buf), compose->account->name,
strlen("From: "));
+ QUOTE_IF_REQUIRED(name, buf);
fprintf(fp, "From: %s <%s>\n",
- buf, compose->account->address);
+ name, compose->account->address);
} else
fprintf(fp, "From: %s\n", compose->account->address);
}
#if 0 /* NEW COMPOSE GUI */
if (compose->use_to) {
str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose->to_list = address_list_append
- (compose->to_list, str);
- if (!IS_IN_CUSTOM_HEADER("To")) {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen("To: "));
- fprintf(fp, "To: %s\n", buf);
- }
- }
- }
+ PUT_RECIPIENT_HEADER("To", str);
}
#endif
/* Newsgroups */
compose_write_headers_from_headerlist(compose, fp, "Newsgroups");
#if 0 /* NEW COMPOSE GUI */
- str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- remove_space(str);
+ if (compose->use_newsgroups) {
+ str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
if (*str != '\0') {
- compose->newsgroup_list =
- newsgroup_list_append(compose->newsgroup_list,
- str);
- if (!IS_IN_CUSTOM_HEADER("Newsgroups")) {
+ Xstrdup_a(str, str, return -1);
+ g_strstrip(str);
+ remove_space(str);
+ if (*str != '\0') {
+ compose->newsgroup_list =
+ newsgroup_list_append
+ (compose->newsgroup_list, str);
compose_convert_header(buf, sizeof(buf), str,
strlen("Newsgroups: "));
fprintf(fp, "Newsgroups: %s\n", buf);
#if 0 /* NEW COMPOSE GUI */
if (compose->use_cc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose->to_list = address_list_append
- (compose->to_list, str);
- if (!IS_IN_CUSTOM_HEADER("Cc")) {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen("Cc: "));
- fprintf(fp, "Cc: %s\n", buf);
- }
- }
- }
+ PUT_RECIPIENT_HEADER("Cc", str);
}
#endif
/* Bcc */
#if 0 /* NEW COMPOSE GUI */
if (compose->use_bcc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose->to_list = address_list_append
- (compose->to_list, str);
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Bcc: "));
- fprintf(fp, "Bcc: %s\n", buf);
- }
- }
+ PUT_RECIPIENT_HEADER("Bcc", str);
}
#endif
fprintf(fp, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
- HOST_ALIAS);
+ TARGET_ALIAS);
/* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
if (g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
fprintf(fp, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
- HOST_ALIAS);
+ TARGET_ALIAS);
/* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
procmime_get_encoding_str(encoding));
}
+ /* PRIORITY */
+ switch (compose->priority) {
+ case PRIORITY_HIGHEST: fprintf(fp, "Importance: high\n"
+ "X-Priority: 1 (Highest)\n");
+ break;
+ case PRIORITY_HIGH: fprintf(fp, "Importance: high\n"
+ "X-Priority: 2 (High)\n");
+ break;
+ case PRIORITY_NORMAL: break;
+ case PRIORITY_LOW: fprintf(fp, "Importance: low\n"
+ "X-Priority: 4 (Low)\n");
+ break;
+ case PRIORITY_LOWEST: fprintf(fp, "Importance: low\n"
+ "X-Priority: 5 (Lowest)\n");
+ break;
+ default: debug_print("compose: priority unknown : %d\n",
+ compose->priority);
+ }
+
/* Request Return Receipt */
if (!IS_IN_CUSTOM_HEADER("Disposition-Notification-To")) {
if (compose->return_receipt) {
}
}
+ /* get special headers */
+ for (list = compose->header_list; list; list = list->next) {
+ ComposeHeaderEntry *headerentry;
+ gchar *tmp;
+ gchar *headername;
+ gchar *headername_wcolon;
+ gchar *headername_trans;
+ gchar *headervalue;
+ gchar **string;
+ gboolean standard_header = FALSE;
+
+ headerentry = ((ComposeHeaderEntry *)list->data);
+
+ tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)));
+ if (!strstr(tmp, ":")) {
+ headername_wcolon = g_strconcat(tmp, ":", NULL);
+ headername = g_strdup(tmp);
+ } else {
+ headername_wcolon = g_strdup(tmp);
+ headername = g_strdup(strtok(tmp, ":"));
+ }
+ g_free(tmp);
+
+ headervalue = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ string = std_headers;
+ while (*string != NULL) {
+ headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
+ if (!strcmp(headername_trans,headername_wcolon))
+ standard_header = TRUE;
+ string++;
+ }
+ if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
+ fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
+
+ g_free(headername);
+ g_free(headername_wcolon);
+
+ }
+
/* separator between header and body */
fputs("\n", fp);
lt->tm_min, lt->tm_sec,
(guint)random(), addr);
- debug_print(_("generated Message-ID: %s\n"), buf);
+ debug_print("generated Message-ID: %s\n", buf);
g_free(addr);
}
-static void compose_add_entry_field(GtkWidget *table, GtkWidget **hbox,
- GtkWidget **entry, gint *count,
- const gchar *label_str,
- gboolean is_addr_entry)
-{
- GtkWidget *label;
-
- if (GTK_TABLE(table)->nrows < (*count) + 1)
- gtk_table_resize(GTK_TABLE(table), (*count) + 1, 2);
-
- *hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new
- (prefs_common.trans_hdr ? gettext(label_str) : label_str);
- gtk_box_pack_end(GTK_BOX(*hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table), *hbox, 0, 1, *count, (*count) + 1,
- GTK_FILL, 0, 2, 0);
- *entry = gtk_entry_new_with_max_length(MAX_ENTRY_LENGTH);
- gtk_table_attach
- (GTK_TABLE(table), *entry, 1, 2, *count, (*count) + 1, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
-#if 0 /* NEW COMPOSE GUI */
- if (GTK_TABLE(table)->nrows > (*count) + 1)
- gtk_table_set_row_spacing(GTK_TABLE(table), *count, 4);
-#endif
-
- if (is_addr_entry)
- address_completion_register_entry(GTK_ENTRY(*entry));
-
- (*count)++;
-}
-
static void compose_create_header_entry(Compose *compose)
{
gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GList *combo_list = NULL;
gchar **string, *header;
ComposeHeaderEntry *headerentry;
+ gboolean standard_header = FALSE;
headerentry = g_new0(ComposeHeaderEntry, 1);
}
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_list_free(combo_list);
- gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), FALSE);
+ gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), TRUE);
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);
- if(compose->header_last) {
- header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
- } else {
+ if (compose->header_last) {
+ 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))
+ standard_header = TRUE;
+ string++;
+ }
+ if (standard_header)
+ header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ }
+ if (!compose->header_last || !standard_header) {
switch(compose->account->protocol) {
case A_NNTP:
header = prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:";
/* drag and drop */
gtk_drag_dest_set(attach_clist,
GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
- GDK_ACTION_COPY);
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
gtk_signal_connect(GTK_OBJECT(attach_clist), "drag_data_received",
GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
compose);
savemsg_checkbtn = gtk_check_button_new_with_label(_("Save Message to "));
gtk_widget_show(savemsg_checkbtn);
gtk_table_attach(GTK_TABLE(table), savemsg_checkbtn, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
- if(folder_get_default_outbox()) {
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
}
gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
gtk_widget_show(savemsg_entry);
gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
- if(folder_get_default_outbox()) {
- folderidentifier = folder_item_get_identifier(folder_get_default_outbox());
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
+ folderidentifier = folder_item_get_identifier(account_get_special_folder
+ (compose->account, F_OUTBOX));
gtk_entry_set_text(GTK_ENTRY(savemsg_entry), folderidentifier);
g_free(folderidentifier);
}
GtkWidget *scrolledwin;
GtkWidget *text;
- GtkWidget *table;
-
UndoMain *undostruct;
gchar *titles[N_ATTACH_COLS];
GdkColormap *cmap;
GdkColor color[1];
gboolean success[1];
- GdkFont *font;
GtkWidget *popupmenu;
- GtkWidget *menuitem;
GtkItemFactory *popupfactory;
GtkItemFactory *ifactory;
GtkWidget *tmpl_menu;
gint n_entries;
-#if USE_PSPELL
- GtkPspell * gtkpspell = NULL;
+#if USE_ASPELL
+ GtkAspell * gtkaspell = NULL;
#endif
+ static GdkGeometry geometry;
+
g_return_val_if_fail(account != NULL, NULL);
- debug_print(_("Creating compose window...\n"));
+ debug_print("Creating compose window...\n");
compose = g_new0(Compose, 1);
titles[COL_MIMETYPE] = _("MIME type");
titles[COL_NAME] = _("Name");
compose->account = account;
- compose->orig_account = account;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
gtk_widget_set_usize(window, -1, prefs_common.compose_height);
gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
+
+ if (!geometry.max_width) {
+ geometry.max_width = gdk_screen_width();
+ geometry.max_height = gdk_screen_height();
+ }
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
+ &geometry, GDK_HINT_MAX_SIZE);
+
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(compose_delete_cb), compose);
gtk_signal_connect(GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
gtk_signal_connect(GTK_OBJECT(text), "activate",
GTK_SIGNAL_FUNC(text_activated), compose);
+ gtk_signal_connect(GTK_OBJECT(text), "insert_text",
+ GTK_SIGNAL_FUNC(text_inserted), compose);
gtk_signal_connect_after(GTK_OBJECT(text), "button_press_event",
GTK_SIGNAL_FUNC(compose_button_press_cb),
edit_vbox);
/* drag and drop */
gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
- GDK_ACTION_COPY);
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
compose);
new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
- CharSet charset;
+ GdkFont *font;
- charset = conv_get_current_charset();
- if (MB_CUR_MAX == 1) {
- gchar *fontstr, *p;
-
- Xstrdup_a(fontstr, prefs_common.textfont, );
- if (fontstr && (p = strchr(fontstr, ',')) != NULL)
- *p = '\0';
- font = gdk_font_load(fontstr);
- } else
- font = gdk_fontset_load(prefs_common.textfont);
- if (font) {
+ if ((font = gtkut_font_load(prefs_common.textfont)) != NULL) {
gdk_font_unref(new_style->font);
new_style->font = font;
}
gtk_widget_hide(newsgroups_hbox);
gtk_widget_hide(newsgroups_entry);
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
- menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
}
#endif
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
menubar);
- gtk_widget_show(window);
-
address_completion_start(window);
compose->window = window;
compose->replyinfo = NULL;
compose->replyto = NULL;
- compose->mailinglist = NULL;
compose->cc = NULL;
compose->bcc = NULL;
compose->followup_to = NULL;
+
+ compose->ml_post = NULL;
+
compose->inreplyto = NULL;
compose->references = NULL;
compose->msgid = NULL;
compose->modified = FALSE;
compose->return_receipt = FALSE;
+ compose->paste_as_quotation = FALSE;
compose->to_list = NULL;
compose->newsgroup_list = NULL;
compose->exteditor_readdes = -1;
compose->exteditor_tag = -1;
- compose->bounce_filename = NULL;
+ compose->redirect_filename = NULL;
compose->undostruct = undostruct;
-#if USE_PSPELL
+#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", FALSE);
- if (prefs_common.enable_pspell) {
- gtkpspell = gtkpspell_new((const gchar*)prefs_common.dictionary,
+ if (prefs_common.enable_aspell &&
+ strcmp(prefs_common.dictionary, _("None"))) {
+ gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
conv_get_current_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.use_alternate,
GTK_STEXT(text));
- if (!gtkpspell) {
- alertpanel_error(_("Spell checker could not be started.\n%s"), gtkpspellcheckers->error_message);
- gtkpspell_checkers_reset_error();
+ if (!gtkaspell) {
+ alertpanel_error(_("Spell checker could not be started.\n%s"), gtkaspellcheckers->error_message);
+ gtkaspell_checkers_reset_error();
} else {
GtkWidget *menuitem;
- if (!gtkpspell_set_sug_mode(gtkpspell, prefs_common.pspell_sugmode)) {
- debug_print(_("Pspell: could not set suggestion mode %s"),
- gtkpspellcheckers->error_message);
- gtkpspell_checkers_reset_error();
+ if (!gtkaspell_set_sug_mode(gtkaspell, prefs_common.aspell_sugmode)) {
+ debug_print("Aspell: could not set suggestion mode %s\n",
+ gtkaspellcheckers->error_message);
+ gtkaspell_checkers_reset_error();
}
menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
- gtkpspell_populate_submenu(gtkpspell, menuitem);
+ gtkaspell_populate_submenu(gtkaspell, menuitem);
menu_set_sensitive(ifactory, "/Spelling", TRUE);
}
}
#endif
- compose_set_title(compose);
-
-#if 0 /* NEW COMPOSE GUI */
- compose->use_bcc = FALSE;
- compose->use_replyto = FALSE;
- compose->use_followupto = FALSE;
-#endif
-
-#if USE_PSPELL
- compose->gtkpspell = gtkpspell;
-#endif
-
-#if 0 /* NEW COMPOSE GUI */
- if (account->protocol != A_NNTP) {
- menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
- }
+ compose_select_account(compose, account);
+
+#if USE_ASPELL
+ compose->gtkaspell = gtkaspell;
#endif
- if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT) {
+
+ if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
-#if 0 /* NEW COMPOSE GUI */
- compose->use_cc = TRUE;
- gtk_entry_set_text(GTK_ENTRY(cc_entry), account->auto_cc);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-#endif
- }
- if (account->set_autobcc) {
+
+ if (account->set_autobcc)
compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
-#if 0 /* NEW COMPOSE GUI */
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- if (account->auto_bcc && mode != COMPOSE_REEDIT)
- gtk_entry_set_text(GTK_ENTRY(bcc_entry),
- account->auto_bcc);
-#endif
- }
- if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT) {
+
+ if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO);
-#if 0 /* NEW COMPOSE GUI */
- compose->use_replyto = TRUE;
- menuitem = gtk_item_factory_get_item(ifactory,
- "/View/Reply to");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_entry_set_text(GTK_ENTRY(reply_entry),
- account->auto_replyto);
-#endif
- }
- if (account->protocol != A_NNTP) {
+
+ if (account->protocol != A_NNTP)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
- } else {
+ else
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
- }
-
-#if 0 /* NEW COMPOSE GUI */
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.show_ruler);
-#endif
-
-#if USE_GPGME
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_sign);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_encrypt);
-#endif /* USE_GPGME */
addressbook_set_target_compose(compose);
+ update_compose_actions_menu(ifactory, "/Tools/Actions", compose);
compose_set_template_menu(compose);
compose_list = g_list_append(compose_list, compose);
-#if 0 /* NEW COMPOSE GUI */
- compose->use_to = FALSE;
- compose->use_cc = FALSE;
- compose->use_attach = TRUE;
-#endif
-
-#if 0 /* NEW COMPOSE GUI */
- if (!compose->use_bcc) {
- gtk_widget_hide(bcc_hbox);
- gtk_widget_hide(bcc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
- }
- if (!compose->use_replyto) {
- gtk_widget_hide(reply_hbox);
- gtk_widget_hide(reply_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
- }
- if (!compose->use_followupto) {
- gtk_widget_hide(followup_hbox);
- gtk_widget_hide(followup_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
- }
-#endif
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
- select_account(compose, account);
+ /* Priority */
+ compose->priority = PRIORITY_NORMAL;
+ compose_update_priority_menu_item(compose);
+
+#if USE_GPGME
+ activate_gnupg_mode(compose, account);
+#endif
+
set_toolbar_style(compose);
+ gtk_widget_show(window);
+
return compose;
}
-static void compose_toolbar_create(Compose *compose, GtkWidget *container)
+static void toolbar_compose_buttons_cb(GtkWidget *widget,
+ ToolbarItem *t_item)
+{
+ struct {
+ gint index;
+ void (*func)(GtkWidget *widget, gpointer data);
+ } compose_action[] = {
+ { A_SEND, toolbar_send_cb },
+ { A_SENDL, toolbar_send_later_cb },
+ { A_DRAFT, toolbar_draft_cb },
+ { A_INSERT, toolbar_insert_cb },
+ { A_ATTACH, toolbar_attach_cb },
+ { A_SIG, toolbar_sig_cb },
+ { A_EXTEDITOR, toolbar_ext_editor_cb },
+ { A_LINEWRAP, toolbar_linewrap_cb },
+ { A_ADDRBOOK, toolbar_address_cb },
+ { A_SYL_ACTIONS, toolbar_actions_execute_cb }};
+
+
+ gint num_items = sizeof(compose_action)/sizeof(compose_action[0]);
+ gint i;
+ debug_print("_buttons: index: %i \n", t_item->index);
+ for (i = 0; i < num_items; i++) {
+
+ if (compose_action[i].index == t_item->index) {
+ Compose *compose = (Compose*)t_item->parent;
+ debug_print("_buttons: compose: %p toolbar: %p\n", compose, compose->toolbar); compose_action[i].func(widget, compose);
+ break;
+ }
+ }
+}
+
+static void compose_toolbar_update(Compose *compose)
+{
+ gtk_container_remove(GTK_CONTAINER(compose->handlebox),
+ GTK_WIDGET(compose->toolbar->toolbar));
+
+ compose->toolbar->toolbar = NULL;
+ compose->toolbar->send_btn = NULL;
+ compose->toolbar->sendl_btn = NULL;
+ compose->toolbar->draft_btn = NULL;
+ compose->toolbar->insert_btn = NULL;
+ compose->toolbar->attach_btn = NULL;
+ compose->toolbar->sig_btn = NULL;
+ compose->toolbar->exteditor_btn = NULL;
+ compose->toolbar->linewrap_btn = NULL;
+ compose->toolbar->addrbook_btn = NULL;
+
+ TOOLBAR_DESTROY_ITEMS(compose->toolbar->t_item_list);
+ TOOLBAR_DESTROY_ACTIONS(compose->toolbar->t_action_list);
+ compose_toolbar_create(compose, compose->handlebox);
+}
+
+static void compose_toolbar_create(Compose *compose,
+ GtkWidget *container)
{
+ ToolbarItem *toolbar_item;
+
GtkWidget *toolbar;
- GtkWidget *icon_wid;
- GtkWidget *send_btn;
- GtkWidget *sendl_btn;
- GtkWidget *draft_btn;
- GtkWidget *insert_btn;
- GtkWidget *attach_btn;
- GtkWidget *sig_btn;
- GtkWidget *exteditor_btn;
- GtkWidget *linewrap_btn;
- GtkWidget *addrbook_btn;
+ GtkWidget *icon_wid = NULL;
+ GtkWidget *item;
+ GtkTooltips *toolbar_tips;
+ ToolbarSylpheedActions *t_action_item;
+ GSList *cur;
+ GSList *toolbar_list;
+ GList *elem;
+ toolbar_tips = gtk_tooltips_new();
+
+ toolbar_read_config_file(TOOLBAR_COMPOSE);
+ toolbar_list = toolbar_get_list(TOOLBAR_COMPOSE);
+ compose->toolbar = g_new0(ComposeToolbar, 1);
+
+ for (elem = compose_list; elem != NULL; elem = elem->next) {
+ Compose *c = (Compose*)elem->data;
+ debug_print("toolbar_create: compose: %p toolbar: %p\n",
+ c, c->toolbar);
+ }
+
toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_BOTH);
gtk_container_add(GTK_CONTAINER(container), toolbar);
gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_SPACE_LINE);
+
+ for (cur = toolbar_list; cur != NULL; cur = cur->next) {
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
- send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Send"),
- _("Send message"),
- "Send",
- icon_wid, toolbar_send_cb, compose);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE);
- sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Send later"),
- _("Put into queue folder and send later"),
- "Send later",
- icon_wid, toolbar_send_later_cb,
- compose);
+ if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
+ gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+ continue;
+ }
+
+ toolbar_item = g_new0(ToolbarItem, 1);
+ toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
+ toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
+ toolbar_item->index = ((ToolbarItem*)cur->data)->index;
+
+ toolbar_item->parent = (gpointer)compose;
+
+ /* collect toolbar items in list to keep track */
+ compose->toolbar->t_item_list = g_slist_append(compose->toolbar->t_item_list,
+ toolbar_item);
+
+ icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
+ item = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ toolbar_item->text,
+ (""),
+ (""),
+ icon_wid, toolbar_compose_buttons_cb,
+ toolbar_item);
+
+ switch (toolbar_item->index) {
+ case A_SEND:
+ compose->toolbar->send_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->send_btn,
+ _("Send Message"), NULL);
+ break;
+ case A_SENDL:
+ compose->toolbar->sendl_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->sendl_btn,
+ _("Put into queue folder and send later"), NULL);
+ break;
+ case A_DRAFT:
+ compose->toolbar->draft_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->draft_btn,
+ _("Save to draft folder"), NULL);
+ break;
+ case A_INSERT:
+ compose->toolbar->insert_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->insert_btn,
+ _("Insert file"), NULL);
+ break;
+ case A_ATTACH:
+ compose->toolbar->attach_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->attach_btn,
+ _("Attach file"), NULL);
+ break;
+ case A_SIG:
+ compose->toolbar->sig_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->sig_btn,
+ _("Insert signature"), NULL);
+ break;
+ case A_EXTEDITOR:
+ compose->toolbar->exteditor_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->exteditor_btn,
+ _("Edit with external editor"), NULL);
+ break;
+ case A_LINEWRAP:
+ compose->toolbar->linewrap_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->linewrap_btn,
+ _("Wrap all long lines"), NULL);
+ break;
+ case A_ADDRBOOK:
+ compose->toolbar->addrbook_btn = item;
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ compose->toolbar->addrbook_btn,
+ _("Address book"), NULL);
+ break;
+ case A_SYL_ACTIONS:
+ t_action_item = g_new0(ToolbarSylpheedActions, 1);
+ t_action_item->widget = item;
+ t_action_item->name = g_strdup(toolbar_item->text);
+
+ compose->toolbar->t_action_list =
+ g_slist_append(compose->toolbar->t_action_list,
+ t_action_item);
+
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
+ item,
+ t_action_item->name, NULL);
+
+ gtk_widget_show(item);
+ break;
+ default:
+ break;
+ }
+ }
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
- draft_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Draft"),
- _("Save to draft folder"),
- "Draft",
- icon_wid, toolbar_draft_cb,
- compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_INSERT_FILE);
- insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Insert"),
- _("Insert file"),
- "Insert",
- icon_wid, toolbar_insert_cb,
- compose);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_ATTACH);
- attach_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Attach"),
- _("Attach file"),
- "Attach",
- icon_wid, toolbar_attach_cb,
- compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SIGN);
- sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Signature"),
- _("Insert signature"),
- "Signature",
- icon_wid, toolbar_sig_cb, compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EDIT_EXTERN);
- exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Editor"),
- _("Edit with external editor"),
- "Editor",
- icon_wid,
- toolbar_ext_editor_cb,
- compose);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_LINEWRAP);
- linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Linewrap"),
- _("Wrap all long lines"),
- "Linewrap",
- icon_wid,
- toolbar_linewrap_cb,
- compose);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_ADDRESS_BOOK);
- addrbook_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Address"),
- _("Address book"),
- "Address",
- icon_wid, toolbar_address_cb,
- compose);
-
- compose->toolbar = toolbar;
- compose->send_btn = send_btn;
- compose->sendl_btn = sendl_btn;
- compose->draft_btn = draft_btn;
- compose->insert_btn = insert_btn;
- compose->attach_btn = attach_btn;
- compose->sig_btn = sig_btn;
- compose->exteditor_btn = exteditor_btn;
- compose->linewrap_btn = linewrap_btn;
- compose->addrbook_btn = addrbook_btn;
+ compose->toolbar->toolbar = toolbar;
gtk_widget_show_all(toolbar);
}
+static void compose_toolbar_set_sensitive (Compose * compose, gboolean sensitive)
+{
+ GSList *items = compose->toolbar->t_action_list;
+ if (compose->toolbar->send_btn)
+ gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
+ if (compose->toolbar->sendl_btn)
+ gtk_widget_set_sensitive(compose->toolbar->sendl_btn, sensitive);
+ if (compose->toolbar->draft_btn )
+ gtk_widget_set_sensitive(compose->toolbar->draft_btn , sensitive);
+ if (compose->toolbar->insert_btn )
+ gtk_widget_set_sensitive(compose->toolbar->insert_btn , sensitive);
+ if (compose->toolbar->attach_btn)
+ gtk_widget_set_sensitive(compose->toolbar->attach_btn, sensitive);
+ if (compose->toolbar->sig_btn)
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
+ if (compose->toolbar->exteditor_btn)
+ gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+ if (compose->toolbar->linewrap_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, sensitive);
+ if (compose->toolbar->addrbook_btn)
+ gtk_widget_set_sensitive(compose->toolbar->addrbook_btn, sensitive);
+ for (; items != NULL; items = g_slist_next(items)) {
+ ToolbarSylpheedActions *item = (ToolbarSylpheedActions *)items->data;
+ gtk_widget_set_sensitive(item->widget, sensitive);
+ }
+}
+
static GtkWidget *compose_account_option_menu_create(Compose *compose)
{
GList *accounts;
if (ac == compose->account) def_menu = num;
- name = g_strdup_printf("%s: %s <%s>",
- ac->account_name, ac->name, ac->address);
+ if (ac->name)
+ name = g_strdup_printf("%s: %s <%s>",
+ ac->account_name,
+ ac->name, ac->address);
+ else
+ name = g_strdup_printf("%s: %s",
+ ac->account_name, ac->address);
MENUITEM_ADD(menu, menuitem, name, ac);
g_free(name);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
return hbox;
}
+static void compose_set_priority_cb(gpointer data,
+ guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *) data;
+ compose->priority = action;
+}
+
+static void compose_update_priority_menu_item(Compose * compose)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ switch (compose->priority) {
+ case PRIORITY_HIGHEST:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Priority/Highest");
+ break;
+ case PRIORITY_HIGH:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Priority/High");
+ break;
+ case PRIORITY_NORMAL:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Priority/Normal");
+ break;
+ case PRIORITY_LOW:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Priority/Low");
+ break;
+ case PRIORITY_LOWEST:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Priority/Lowest");
+ break;
+ }
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+}
+
+#if USE_GPGME
+static void compose_set_gnupg_mode_cb(gpointer data,
+ guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *) data;
+ compose->gnupg_mode = action;
+}
+
+static void compose_update_gnupg_mode_menu_item(Compose * compose)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ switch (compose->gnupg_mode) {
+ case GNUPG_MODE_DETACH:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Mode/MIME");
+ break;
+ case GNUPG_MODE_INLINE:
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Mode/Inline");
+ break;
+ }
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
+ if (compose->use_encryption == TRUE || compose->use_signing == TRUE)
+ menu_set_sensitive(ifactory, "/Message/Mode", TRUE);
+ else
+ menu_set_sensitive(ifactory, "/Message/Mode", FALSE);
+}
+#endif
+
static void compose_set_template_menu(Compose *compose)
{
GSList *tmpl_list, *cur;
for (cur = compose_list; cur != NULL; cur = cur->next) {
compose = (Compose *)cur->data;
- gtk_container_remove(GTK_CONTAINER(compose->handlebox), GTK_WIDGET(compose->toolbar));
- compose->toolbar = NULL;
- compose_toolbar_create(compose, compose->handlebox);
+ compose_toolbar_update(compose);
set_toolbar_style(compose);
}
}
-
-static void compose_template_apply(Compose *compose, Template *tmpl)
+static void compose_template_apply(Compose *compose, Template *tmpl,
+ gboolean replace)
{
gchar *qmark;
gchar *parsed_str;
tmpl->subject);
if (tmpl->to && *tmpl->to != '\0')
compose_entry_append(compose, tmpl->to, COMPOSE_TO);
+ if (tmpl->cc && *tmpl->cc != '\0')
+ compose_entry_append(compose, tmpl->cc, COMPOSE_CC);
- gtk_stext_clear(GTK_STEXT(compose->text));
+ if (tmpl->bcc && *tmpl->bcc != '\0')
+ compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
- if (compose->replyinfo == NULL) {
- MsgInfo dummyinfo;
+ if (replace)
+ gtk_stext_clear(GTK_STEXT(compose->text));
- memset(&dummyinfo, 0, sizeof(MsgInfo));
- parsed_str = compose_quote_fmt(compose, &dummyinfo,
- tmpl->value, NULL, NULL);
+ if (compose->replyinfo == NULL) {
+ parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
+ NULL, NULL);
} else {
if (prefs_common.quotemark && *prefs_common.quotemark)
qmark = prefs_common.quotemark;
tmpl->value, qmark, NULL);
}
- if (parsed_str && prefs_common.auto_sig)
+ if (replace && parsed_str && prefs_common.auto_sig)
compose_insert_sig(compose);
+ if (replace && parsed_str) {
+ gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
+ gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ }
+
+ if (parsed_str)
+ compose_changed_cb(NULL, compose);
+
gtk_stext_thaw(GTK_STEXT(compose->text));
}
g_free(compose->newsgroups);
g_free(compose->followup_to);
+ g_free(compose->ml_post);
+
g_free(compose->inreplyto);
g_free(compose->references);
g_free(compose->msgid);
g_free(compose->boundary);
- if (compose->bounce_filename)
- g_free(compose->bounce_filename);
+ if (compose->redirect_filename)
+ g_free(compose->redirect_filename);
g_free(compose->exteditor_file);
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
-#if USE_PSPELL
- if (compose->gtkpspell) {
- gtkpspell_delete(compose->gtkpspell);
+#if USE_ASPELL
+ if (compose->gtkaspell) {
+ gtkaspell_delete(compose->gtkaspell);
}
#endif
gtk_widget_destroy(compose->paned);
+ TOOLBAR_DESTROY_ITEMS(compose->toolbar->t_item_list);
+ TOOLBAR_DESTROY_ACTIONS(compose->toolbar->t_action_list);
+ g_free(compose->toolbar);
g_free(compose);
compose_list = g_list_remove(compose_list, compose);
static void compose_exec_ext_editor(Compose *compose)
{
- gchar tmp[64];
+ gchar *tmp;
pid_t pid;
gint pipe_fds[2];
- g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%08x",
- g_get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
+ tmp = g_strdup_printf("%s%ctmpmsg.%08x", get_tmp_dir(),
+ G_DIR_SEPARATOR, (gint)compose);
if (pipe(pipe_fds) < 0) {
perror("pipe");
+ g_free(tmp);
return;
}
if ((pid = fork()) < 0) {
perror("fork");
+ g_free(tmp);
return;
}
close(pipe_fds[1]);
_exit(0);
}
+
+ g_free(tmp);
}
static gint compose_exec_ext_editor_real(const gchar *file)
Compose *compose = (Compose *)data;
gint i = 0;
- debug_print(_("Compose: input from monitoring process\n"));
+ debug_print("Compose: input from monitoring process\n");
gdk_input_remove(compose->exteditor_tag);
menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
sensitive);
- gtk_widget_set_sensitive(compose->text, sensitive);
- gtk_widget_set_sensitive(compose->send_btn, sensitive);
- gtk_widget_set_sensitive(compose->sendl_btn, sensitive);
- gtk_widget_set_sensitive(compose->draft_btn, sensitive);
- gtk_widget_set_sensitive(compose->insert_btn, sensitive);
- gtk_widget_set_sensitive(compose->sig_btn, sensitive);
- gtk_widget_set_sensitive(compose->exteditor_btn, sensitive);
- gtk_widget_set_sensitive(compose->linewrap_btn, sensitive);
+ gtk_widget_set_sensitive(compose->text, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->sendl_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->draft_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->insert_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, sensitive);
}
/**
compose_address_cb(data, 0, NULL);
}
-static void select_account(Compose * compose, PrefsAccount * ac)
+static void toolbar_actions_execute_cb(GtkWidget *widget,
+ gpointer data)
{
-#if USE_GPGME
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-#endif /* USE_GPGME */
- compose->account = ac;
- compose_set_title(compose);
-
-#if 0 /* NEW COMPOSE GUI */
- if (ac->protocol == A_NNTP) {
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory,
- "/Message/Followup to", TRUE);
- gtk_widget_show(compose->newsgroups_hbox);
- gtk_widget_show(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 1, 4);
-
- compose->use_to = FALSE;
- compose->use_cc = FALSE;
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
- menu_set_sensitive(ifactory,
- "/Message/To", TRUE);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
- gtk_widget_hide(compose->to_hbox);
- gtk_widget_hide(compose->to_entry);
- gtk_widget_hide(compose->cc_hbox);
- gtk_widget_hide(compose->cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 0, 0);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 3, 0);
- }
- else {
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory,
- "/Message/Followup to", FALSE);
- gtk_entry_set_text(GTK_ENTRY(compose->newsgroups_entry), "");
- gtk_widget_hide(compose->newsgroups_hbox);
- gtk_widget_hide(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 1, 0);
-
- compose->use_to = TRUE;
- compose->use_cc = TRUE;
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- menu_set_sensitive(ifactory,
- "/Message/To", FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_show(compose->to_hbox);
- gtk_widget_show(compose->to_entry);
- gtk_widget_show(compose->cc_hbox);
- gtk_widget_show(compose->cc_entry);
-
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 0, 4);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table),
- 3, 4);
- }
- gtk_widget_queue_resize(compose->table_vbox);
-#endif
-#if USE_GPGME
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory,
- "/Message/Sign", TRUE);
- menu_set_sensitive(ifactory,
- "/Message/Encrypt", TRUE);
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
- if (ac->default_sign)
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- else
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
- if (ac->default_encrypt)
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- else
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
-#endif /* USE_GPGME */
+ Compose *compose = (Compose*)data;
+ toolbar_action_execute(widget, compose->toolbar->t_action_list, data, TOOLBAR_COMPOSE);
}
static void account_activated(GtkMenuItem *menuitem, gpointer data)
g_return_if_fail(ac != NULL);
if (ac != compose->account)
- select_account(compose, ac);
+ compose_select_account(compose, ac);
}
static void attach_selected(GtkCList *clist, gint row, gint column,
}
}
+static void compose_allow_user_actions (Compose *compose, gboolean allow)
+{
+ GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
+ compose_toolbar_set_sensitive(compose, allow);
+ menu_set_sensitive(ifactory, "/File", allow);
+ menu_set_sensitive(ifactory, "/Edit", allow);
+ menu_set_sensitive(ifactory, "/Message", allow);
+ menu_set_sensitive(ifactory, "/Tools", allow);
+ menu_set_sensitive(ifactory, "/Help", allow);
+}
+
static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
gint val;
-
+
+ if (prefs_common.work_offline)
+ if (alertpanel(_("Offline warning"),
+ _("You're working offline. Override?"),
+ _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ return;
+
+ compose_allow_user_actions (compose, FALSE);
+ compose->sending = TRUE;
val = compose_send(compose);
+ compose_allow_user_actions (compose, TRUE);
+ compose->sending = FALSE;
if (val == 0) gtk_widget_destroy(compose->window);
}
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue(compose, NULL, NULL);
+ val = compose_queue_sub(compose, NULL, NULL, TRUE);
if (!val) gtk_widget_destroy(compose->window);
}
+void compose_draft (gpointer data)
+{
+ compose_draft_cb(data, 0, NULL);
+}
+
static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
gchar *tmp;
gint msgnum;
static gboolean lock = FALSE;
-
+ MsgInfo *newmsginfo;
+
if (lock) return;
- if (compose->account && compose->account->folder &&
- FOLDER(compose->account->folder)->draft)
- draft = FOLDER(compose->account->folder)->draft;
- else
- draft = folder_get_default_draft();
+ draft = account_get_special_folder(compose->account, F_DRAFT);
g_return_if_fail(draft != NULL);
lock = TRUE;
- tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
+ tmp = g_strdup_printf("%s%cdraft.%08x", get_tmp_dir(),
G_DIR_SEPARATOR, (gint)compose);
if (compose_write_to_file(compose, tmp, TRUE) < 0) {
return;
}
- folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, TRUE)) < 0) {
unlink(tmp);
g_free(tmp);
compose_remove_reedit_target(compose);
if (compose->targetinfo &&
compose->targetinfo->folder != draft)
- folderview_update_item(compose->targetinfo->folder,
+ folder_update_item(compose->targetinfo->folder,
TRUE);
}
- folder_item_scan(draft);
- folderview_update_item(draft, TRUE);
-
+ newmsginfo = folder_item_fetch_msginfo(draft, msgnum);
+ procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
+ MSG_SET_TMP_FLAGS(newmsginfo->flags, MSG_DRAFT);
+ folder_update_item(draft, TRUE);
+ procmsg_msginfo_free(newmsginfo);
+
lock = FALSE;
/* 0: quit editing 1: keep editing */
g_free(path);
procmsg_msginfo_free(compose->targetinfo);
- compose->targetinfo = g_new0(MsgInfo, 1);
+ compose->targetinfo = procmsg_msginfo_new();
compose->targetinfo->msgnum = msgnum;
compose->targetinfo->size = s.st_size;
compose->targetinfo->mtime = s.st_mtime;
Compose *compose = (Compose *)data;
GList *file_list;
- if (compose->bounce_filename != NULL)
+ if (compose->redirect_filename != NULL)
return;
file_list = filesel_select_multiple_files(_("Select file"), NULL);
static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
- compose_close_cb(data, 0, NULL);
+ Compose *compose = (Compose *)data;
+ if (compose->sending)
+ return TRUE;
+ compose_close_cb(compose, 0, NULL);
return TRUE;
}
{
Compose *compose = (Compose *)data;
AlertValue val;
-
+
if (compose->exteditor_tag != -1) {
if (!compose_ext_editor_kill(compose))
return;
switch (val) {
case G_ALERTDEFAULT:
+ if (prefs_common.autosave)
+ compose_remove_draft(compose);
break;
case G_ALERTALTERNATE:
compose_draft_cb(data, 0, NULL);
return;
}
}
+
gtk_widget_destroy(compose->window);
}
{
Compose *compose = (Compose *)data;
Template *tmpl;
+ gchar *msg;
+ AlertValue val;
tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
g_return_if_fail(tmpl != NULL);
- compose_template_apply(compose, tmpl);
+ msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
+ tmpl->name);
+ val = alertpanel(_("Apply template"), msg,
+ _("Replace"), _("Insert"), _("Cancel"));
+ g_free(msg);
+
+ if (val == G_ALERTDEFAULT)
+ compose_template_apply(compose, tmpl, TRUE);
+ else if (val == G_ALERTALTERNATE)
+ compose_template_apply(compose, tmpl, FALSE);
}
static void compose_ext_editor_cb(gpointer data, guint action,
static void compose_destroy_cb(GtkWidget *widget, Compose *compose)
{
+ if (compose->sending)
+ return;
compose_destroy(compose);
}
(GTK_EDITABLE(compose->focused_editable));
}
+static void compose_paste_as_quote_cb(Compose *compose)
+{
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable)) {
+ compose->paste_as_quotation = TRUE;
+ gtk_editable_paste_clipboard
+ (GTK_EDITABLE(compose->focused_editable));
+ compose->paste_as_quotation = FALSE;
+ }
+}
+
static void compose_allsel_cb(Compose *compose)
{
if (compose->focused_editable &&
(GTK_EDITABLE(compose->focused_editable), 0, -1);
}
-static void compose_move_beginning_of_line_cb(Compose *compose)
+static void compose_gtk_stext_action_cb(Compose *compose,
+ ComposeCallGtkSTextAction action)
{
- if (compose->focused_editable &&
- GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
-}
+ GtkSText *text = GTK_STEXT(compose->text);
+ static struct {
+ void (*do_action) (GtkSText *text);
+ } action_table[] = {
+ {gtk_stext_move_beginning_of_line},
+ {gtk_stext_move_forward_character},
+ {gtk_stext_move_backward_character},
+ {gtk_stext_move_forward_word},
+ {gtk_stext_move_backward_word},
+ {gtk_stext_move_end_of_line},
+ {gtk_stext_move_next_line},
+ {gtk_stext_move_previous_line},
+ {gtk_stext_delete_forward_character},
+ {gtk_stext_delete_backward_character},
+ {gtk_stext_delete_forward_word},
+ {gtk_stext_delete_backward_word},
+ {gtk_stext_delete_line},
+ {gtk_stext_delete_line}, /* gtk_stext_delete_line_n */
+ {gtk_stext_delete_to_line_end}
+ };
-static void compose_gtk_stext_action_cb(Compose *compose, ComposeCallGtkSTextAction action)
-{
- if (!(compose->focused_editable && GTK_WIDGET_HAS_FOCUS(compose->focused_editable))) return;
-
- switch (action) {
- case COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE:
- gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER:
- gtk_stext_move_forward_character(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER:
- gtk_stext_move_backward_character(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD:
- gtk_stext_move_forward_word(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD:
- gtk_stext_move_backward_word(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE:
- gtk_stext_move_end_of_line(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE:
- gtk_stext_move_next_line(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE:
- gtk_stext_move_previous_line(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER:
- gtk_stext_delete_forward_character(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER:
- gtk_stext_delete_backward_character(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD:
- gtk_stext_delete_forward_word(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD:
- gtk_stext_delete_backward_word(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_LINE:
- gtk_stext_delete_line(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N:
- gtk_stext_delete_line(GTK_STEXT(compose->focused_editable));
- gtk_stext_delete_forward_character(GTK_STEXT(compose->focused_editable));
- break;
- case COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END:
- gtk_stext_delete_to_line_end(GTK_STEXT(compose->focused_editable));
- break;
- default:
- break;
- }
+ if (!GTK_WIDGET_HAS_FOCUS(text)) return;
+
+ if (action >= COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE &&
+ action <= COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END)
+ action_table[action].do_action(text);
}
static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
compose->use_signing = TRUE;
else
compose->use_signing = FALSE;
+
+ compose_update_gnupg_mode_menu_item(compose);
}
static void compose_toggle_encrypt_cb(gpointer data, guint action,
compose->use_encryption = TRUE;
else
compose->use_encryption = FALSE;
+
+ compose_update_gnupg_mode_menu_item(compose);
+}
+
+static void activate_gnupg_mode (Compose *compose, PrefsAccount *account)
+{
+ if (account->default_gnupg_mode)
+ compose->gnupg_mode = GNUPG_MODE_INLINE;
+ else
+ compose->gnupg_mode = GNUPG_MODE_DETACH;
+
+ compose_update_gnupg_mode_menu_item(compose);
}
#endif /* USE_GPGME */
compose_send_control_enter(compose);
}
+static void text_inserted(GtkWidget *widget, const gchar *text,
+ gint length, gint *position, Compose *compose)
+{
+ GtkEditable *editable = GTK_EDITABLE(widget);
+
+ gtk_signal_handler_block_by_func(GTK_OBJECT(widget),
+ GTK_SIGNAL_FUNC(text_inserted),
+ compose);
+ if (compose->paste_as_quotation) {
+ gchar *new_text;
+ gchar *qmark;
+ gint pos;
+
+ new_text = g_strndup(text, length);
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
+ gtk_stext_set_point(GTK_STEXT(widget), *position);
+ compose_quote_fmt(compose, NULL, "%Q", qmark, new_text);
+ pos = gtk_stext_get_point(GTK_STEXT(widget));
+ gtk_editable_set_position(editable, pos);
+ *position = pos;
+ g_free(new_text);
+ } else
+ gtk_editable_insert_text(editable, text, length, position);
+
+ if (prefs_common.autowrap)
+ compose_wrap_line_all_full(compose, TRUE);
+
+ gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),
+ GTK_SIGNAL_FUNC(text_inserted),
+ compose);
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+
+
+ if (prefs_common.autosave &&
+ gtk_stext_get_length(GTK_STEXT(widget)) % prefs_common.autosave_length == 0)
+ compose_draft_cb((gpointer)compose, 1, NULL);
+}
+
static gboolean compose_send_control_enter(Compose *compose)
{
GdkEvent *ev;
GtkAccelEntry *accel;
GtkWidget *send_menu;
GSList *list;
+ GdkModifierType ignored_mods =
+ (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK |
+ GDK_MOD4_MASK | GDK_MOD5_MASK);
ev = gtk_get_current_event();
if (ev->type != GDK_KEY_PRESS) return FALSE;
list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu));
accel = (GtkAccelEntry *)list->data;
if (accel->accelerator_key == kev->keyval &&
- accel->accelerator_mods == kev->state) {
+ (accel->accelerator_mods & ~ignored_mods) ==
+ (kev->state & ~ignored_mods)) {
compose_send_cb(compose, 0, NULL);
return TRUE;
}
return FALSE;
}
-#if USE_PSPELL
+#if USE_ASPELL
static void compose_check_all(Compose *compose)
{
- if (compose->gtkpspell)
- gtkpspell_check_all(compose->gtkpspell);
+ if (compose->gtkaspell)
+ gtkaspell_check_all(compose->gtkaspell);
}
static void compose_highlight_all(Compose *compose)
{
- if (compose->gtkpspell)
- gtkpspell_highlight_all(compose->gtkpspell);
+ if (compose->gtkaspell)
+ gtkaspell_highlight_all(compose->gtkaspell);
}
static void compose_check_backwards(Compose *compose)
{
- if (compose->gtkpspell)
- gtkpspell_check_backwards(compose->gtkpspell);
+ if (compose->gtkaspell)
+ gtkaspell_check_backwards(compose->gtkaspell);
else {
GtkItemFactory *ifactory;
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
static void compose_check_forwards_go(Compose *compose)
{
- if (compose->gtkpspell)
- gtkpspell_check_forwards_go(compose->gtkpspell);
+ if (compose->gtkaspell)
+ gtkaspell_check_forwards_go(compose->gtkaspell);
else {
GtkItemFactory *ifactory;
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
gtk_widget_hide(compose->handlebox);
break;
case TOOLBAR_ICON:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
GTK_TOOLBAR_ICONS);
break;
case TOOLBAR_TEXT:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
GTK_TOOLBAR_TEXT);
break;
case TOOLBAR_BOTH:
- gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar->toolbar),
GTK_TOOLBAR_BOTH);
break;
}