#include "gtkshruler.h"
#include "folder.h"
#include "addr_compl.h"
+#include "template_select.h"
#if USE_GPGME
# include "rfc2015.h"
static GList *compose_list = NULL;
-static Compose *compose_create (PrefsAccount *account);
+static Compose *compose_create (PrefsAccount *account,
+ ComposeMode mode);
static void compose_toolbar_create (Compose *compose,
GtkWidget *container);
static GtkWidget *compose_account_option_menu_create
const gchar *type,
ContentType cnttype);
static void compose_wrap_line (Compose *compose);
+static void compose_wrap_line_all (Compose *compose);
static void compose_set_title (Compose *compose);
static PrefsAccount *compose_current_mail_account(void);
const gchar *file);
static gint compose_save_to_outbox (Compose *compose,
const gchar *file);
+static gint compose_remove_reedit_target (Compose *compose);
static gint compose_queue (Compose *compose,
const gchar *file);
static void compose_write_attach (Compose *compose,
gint extra,
gint char_width);
+static void compose_create_header_entry (Compose *compose);
+static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
+
/* callback functions */
static gboolean compose_edit_size_alloc (GtkEditable *widget,
gpointer data);
static void toolbar_address_cb (GtkWidget *widget,
gpointer data);
+static void template_select_cb (gpointer daat,
+ guint action,
+ GtkWidget *widget);
+
static void select_account(Compose * compose, PrefsAccount * ac);
static void account_activated (GtkMenuItem *menuitem,
gboolean ignore_replyto,
gboolean followup_and_reply_to);
+void compose_headerentry_changed_cb (GtkWidget *entry,
+ compose_headerentry *headerentry);
+void compose_headerentry_key_press_event_cb (GtkWidget *entry,
+ GdkEventKey *event,
+ compose_headerentry *headerentry);
+
+Compose * compose_generic_new (PrefsAccount *account,
+ const gchar *to,
+ FolderItem *item);
+
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
static GtkItemFactoryEntry compose_entries[] =
{
{N_("/_File"), NULL, NULL, 0, "<Branch>"},
- {N_("/_File/_Attach file"), "<control>M", compose_attach_cb, 0, NULL},
+ {N_("/_File/_Attach file"), "<control>M", compose_attach_cb, 0, NULL},
{N_("/_File/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
- {N_("/_File/Insert si_gnature"), "<control>G", compose_insert_sig, 0, NULL},
+ {N_("/_File/Insert si_gnature"), "<control>G", compose_insert_sig, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Close"), "<alt>W", compose_close_cb, 0, NULL},
- {N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Edit/_Undo"), "<control>Z", NULL, 0, NULL},
- {N_("/_Edit/_Redo"), "<control>Y", NULL, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Edit/_Undo"), "<control>Z", NULL, 0, NULL},
+ {N_("/_Edit/_Redo"), "<control>Y", NULL, 0, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{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/Select _all"), "<control>A", compose_allsel_cb, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/Wrap long _lines"), "<alt>L", compose_wrap_line, 0, NULL},
- {N_("/_Edit/Edit with e_xternal editor"), "<alt>X",
- compose_ext_editor_cb, 0, NULL},
-
- {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Send"), "<shift><control>S",
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit/_Wrap current paragraph"), "<alt>L", compose_wrap_line, 0, NULL},
+ {N_("/_Edit/Wrap all long _lines"),
+ "<shift><alt>L", compose_wrap_line_all, 0, NULL},
+ {N_("/_Edit/Edit with e_xternal editor"),
+ "<alt>X", compose_ext_editor_cb, 0, NULL},
+
+ {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/_Send"), "<control>Return",
compose_send_cb, 0, NULL},
{N_("/_Message/Send _later"), "<shift><alt>S",
compose_send_later_cb, 0, NULL},
{N_("/_Message/Save to _draft folder"),
- "<alt>D", compose_draft_cb, 0, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_To"), NULL, compose_toggle_to_cb, 0, "<ToggleItem>"},
- {N_("/_Message/_Cc"), NULL, compose_toggle_cc_cb, 0, "<ToggleItem>"},
- {N_("/_Message/_Bcc"), NULL, compose_toggle_bcc_cb, 0, "<ToggleItem>"},
+ "<alt>D", compose_draft_cb, 0, NULL},
+#if 0 /* NEW COMPOSE GUI */
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
+ {N_("/_Message/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
+ {N_("/_Message/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
{N_("/_Message/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Attach"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
+#endif
#if USE_GPGME
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb, 0, "<ToggleItem>"},
+ {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>"},
#endif /* USE_GPGME */
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
- {N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
- {N_("/_Tool/_Address book"), "<alt>A", compose_address_cb, 0, NULL},
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
- {N_("/_Help/_About"), NULL, about_show, 0, NULL}
+ {N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tool/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
+ {N_("/_Tool/_Address book"), "<alt>A", compose_address_cb , 0, NULL},
+ {N_("/_Tool/_Templates ..."), NULL, template_select_cb, 0, NULL},
+ {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
+ {N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
static GtkTargetEntry compose_mime_types[] =
Compose * compose_new(PrefsAccount *account)
{
- return compose_new_with_recipient(account, NULL);
+ return compose_generic_new(account, NULL, NULL);
}
Compose * compose_new_with_recipient(PrefsAccount *account, const gchar *to)
{
- Compose *compose;
+ return compose_generic_new(account, to, NULL);
+}
+Compose * compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
+{
+ return compose_generic_new(account, NULL, item);
+}
+
+Compose * compose_generic_new(PrefsAccount *account, const gchar *to, FolderItem *item)
+{
+ Compose *compose;
+ GList *cur_ac;
+ GList *account_list;
+ PrefsAccount *ac_prefs;
+
+ if (item && item->prefs->enable_default_account) {
+ /* get a PrefsAccount *pointer on the wished account */
+ account_list=account_get_list();
+ for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+ ac_prefs = (PrefsAccount *)cur_ac->data;
+ if (ac_prefs->account_id == item->prefs->default_account) {
+ account = ac_prefs;
+ break;
+ }
+ }
+ }
if (!account) account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account);
- compose->mode = COMPOSE_NEW;
+ compose = compose_create(account, COMPOSE_NEW);
+ compose->replyinfo = NULL;
if (prefs_common.auto_sig)
compose_insert_sig(compose);
if (account->protocol != A_NNTP) {
if (to) {
compose_entry_append(compose, to, COMPOSE_TO);
- gtk_widget_grab_focus(compose->subject_entry);
- } else
- gtk_widget_grab_focus(compose->to_entry);
+ } else if(item && item->prefs->enable_default_to) {
+ compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
+ }
+ 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 (to) {
compose_entry_append(compose, to, COMPOSE_NEWSGROUPS);
- gtk_widget_grab_focus(compose->subject_entry);
- } else
- gtk_widget_grab_focus(compose->newsgroups_entry);
+ }
}
+ gtk_widget_grab_focus(compose->subject_entry);
- return compose;
+ if (prefs_common.auto_exteditor)
+ compose_exec_ext_editor(compose);
+
+ return compose;
}
#define CHANGE_FLAGS(msginfo) \
g_return_val_if_fail(account != NULL, NULL);
g_return_val_if_fail(account->protocol != A_NNTP, NULL);
- compose = compose_create(account);
- compose->mode = COMPOSE_NEW;
+ compose = compose_create(account, COMPOSE_NEW);
if (prefs_common.auto_sig)
compose_insert_sig(compose);
PrefsAccount *account;
PrefsAccount *reply_account;
GtkSText *text;
+ GList *cur_ac;
+ GList *account_list;
+ PrefsAccount *ac_prefs;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- account = msginfo->folder->folder->account;
- if (!account && msginfo->to && prefs_common.reply_account_autoselect) {
- gchar *to;
+ /* select the account set in folderitem's property (if enabled) */
+ account = NULL;
+ if (msginfo->folder->prefs && msginfo->folder->prefs->enable_default_account) {
+ if (!account) {
+ /* get a PrefsAccount *pointer on the wished account */
+ account_list = account_get_list();
+ for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+ ac_prefs = (PrefsAccount *)cur_ac->data;
+ if (ac_prefs->account_id == msginfo->folder->prefs->default_account) {
+ account = ac_prefs;
+ break;
+ }
+ }
+ }
+ }
+
+ /* select the account for the whole folder (IMAP / NNTP) */
+ if (!account)
+ account = msginfo->folder->folder->account;
- to = g_strdup(msginfo->to);
- extract_address(to);
- account = account_find_mail_from_address(to);
- g_free(to);
+ /* select account by to: and cc: header if enabled */
+ if (prefs_common.reply_account_autosel) {
+ if (!account && msginfo->to) {
+ gchar *to;
+ Xstrdup_a(to, msginfo->to, return);
+ extract_address(to);
+ account = account_find_from_address(to);
+ }
+ if (!account) {
+ gchar cc[BUFFSIZE];
+ if(!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
+ extract_address(cc);
+ account = account_find_from_address(cc);
+ }
+ }
}
+
+ /* select current account */
if (!account) account = cur_account;
g_return_if_fail(account != NULL);
if (ignore_replyto && account->protocol == A_NNTP &&
!followup_and_reply_to) {
reply_account =
- account_find_mail_from_address(account->address);
+ account_find_from_address(account->address);
if (!reply_account)
reply_account = compose_current_mail_account();
if (!reply_account)
} else
reply_account = account;
- MSG_UNSET_FLAGS(msginfo->flags, MSG_FORWARDED);
- MSG_SET_FLAGS(msginfo->flags, MSG_REPLIED);
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
CHANGE_FLAGS(msginfo);
- compose = compose_create(reply_account);
- compose->mode = COMPOSE_REPLY;
-
+ compose = compose_create(account, COMPOSE_REPLY);
+ compose->replyinfo = 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
+ if (msginfo->folder && msginfo->folder->ret_rcpt) {
+ GtkItemFactory *ifactory;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+ }
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto,
FILE *fp;
gchar *quote_str;
- if ((fp = procmime_get_text_part(msginfo)) == NULL)
+ if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning(_("Can't get text part\n"));
else {
gchar * qmark;
gtk_editable_set_position(GTK_EDITABLE(text), 0);
gtk_stext_set_point(text, 0);
+ if (quote && prefs_common.linewrap_quote) {
+ compose_wrap_line_all(compose);
+ }
+
gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
+
+ if (prefs_common.auto_exteditor)
+ compose_exec_ext_editor(compose);
}
if (!MSG_IS_ENCRYPTED(msginfo->flags) &&
rfc2015_is_encrypted(mimeinfo)) {
- MSG_SET_FLAGS(msginfo->flags, MSG_ENCRYPTED);
+ MSG_SET_TMP_FLAGS(msginfo->flags, MSG_ENCRYPTED);
}
if (MSG_IS_ENCRYPTED(msginfo->flags) &&
!msginfo->plaintext_file &&
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1); \
}
-Compose * compose_forward(PrefsAccount * account, MsgInfo *msginfo,
- gboolean as_attach)
+Compose *compose_forward(PrefsAccount * account, MsgInfo *msginfo,
+ gboolean as_attach)
{
Compose *compose;
/* PrefsAccount *account; */
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
- if (account == NULL) {
+ account = msginfo->folder->folder->account;
+ if (!account && msginfo->to && prefs_common.forward_account_autosel) {
+ gchar *to;
+ Xstrdup_a(to, msginfo->to, return);
+ extract_address(to);
+ account = account_find_from_address(to);
+ }
+
+ if(!account && prefs_common.forward_account_autosel) {
+ gchar cc[BUFFSIZE];
+ if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+ extract_address(cc);
+ account = account_find_from_address(cc);
+ }
+ }
+
+ if (account == NULL) {
account = cur_account;
/*
account = msginfo->folder->folder->account;
}
g_return_val_if_fail(account != NULL, NULL);
- MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED);
- MSG_SET_FLAGS(msginfo->flags, MSG_FORWARDED);
-
+ MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
+ MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
CHANGE_FLAGS(msginfo);
- compose = compose_create(account);
- compose->mode = COMPOSE_FORWARD;
+ compose = compose_create(account, COMPOSE_FORWARD);
if (msginfo->subject && *msginfo->subject) {
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), "Fw: ");
} else {
FILE *fp;
gchar *quote_str;
-
- if ((fp = procmime_get_text_part(msginfo)) == NULL)
+ if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning(_("Can't get text part\n"));
else {
gchar * qmark;
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
gtk_stext_thaw(text);
+#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP)
gtk_widget_grab_focus(compose->to_entry);
else
gtk_widget_grab_focus(compose->newsgroups_entry);
+#endif
+ gtk_widget_grab_focus(compose->header_last->entry);
- return compose;
+ if (prefs_common.auto_exteditor)
+ compose_exec_ext_editor(compose);
+
+ return compose;
}
#undef INSERT_FW_HEADER
+Compose * compose_forward_multiple(PrefsAccount * account,
+ GSList *msginfo_list)
+{
+ Compose *compose;
+ GtkSText *text;
+ GSList *msginfo;
+ gchar *msgfile;
+
+ g_return_val_if_fail(msginfo_list != NULL, NULL);
+
+ for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
+ if ( ((MsgInfo *)msginfo->data)->folder == NULL )
+ return NULL;
+ }
+
+ if (account == NULL) {
+ account = cur_account;
+ /*
+ account = msginfo->folder->folder->account;
+ if (!account) account = cur_account;
+ */
+ }
+ g_return_val_if_fail(account != NULL, NULL);
+
+ compose = compose_create(account, COMPOSE_FORWARD);
+
+ text = GTK_STEXT(compose->text);
+ gtk_stext_freeze(text);
+
+ for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
+ msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
+ if (!is_file_exist(msgfile))
+ g_warning(_("%s: file not exist\n"), msgfile);
+ else
+ compose_attach_append(compose, msgfile,
+ MIME_MESSAGE_RFC822);
+ g_free(msgfile);
+ }
+
+ 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_stext_thaw(text);
+#if 0 /* NEW COMPOSE GUI */
+ if (account->protocol != A_NNTP)
+ gtk_widget_grab_focus(compose->to_entry);
+ else
+ gtk_widget_grab_focus(compose->newsgroups_entry);
+#endif
+
+ return compose;
+}
+
void compose_reedit(MsgInfo *msginfo)
{
Compose *compose;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- account = msginfo->folder->folder->account;
- if (!account) account = cur_account;
+ account = msginfo->folder->folder->account;
+
+ if(!account&& prefs_common.reedit_account_autosel) {
+ gchar from[BUFFSIZE];
+ if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
+ extract_address(from);
+ account = account_find_from_address(from);
+ }
+ }
+ if (!account) account = cur_account;
g_return_if_fail(account != NULL);
- compose = compose_create(account);
- compose->mode = COMPOSE_REEDIT_DRAFT;
+ compose = compose_create(account, COMPOSE_REEDIT);
compose->targetinfo = procmsg_msginfo_copy(msginfo);
if (compose_parse_header(compose, msginfo) < 0) return;
text = GTK_STEXT(compose->text);
gtk_stext_freeze(text);
- if ((fp = procmime_get_text_part(msginfo)) == NULL)
+ 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)
gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
+
+ if (prefs_common.auto_exteditor)
+ compose_exec_ext_editor(compose);
}
GList *compose_get_compose_list(void)
{
GtkEntry *entry;
const gchar *text;
+ gchar *header;
if (!address || *address == '\0') return;
+#if 0 /* NEW COMPOSE GUI */
switch (type) {
case COMPOSE_CC:
entry = GTK_ENTRY(compose->cc_entry);
if (*text != '\0')
gtk_entry_append_text(entry, ", ");
gtk_entry_append_text(entry, address);
+#endif
+
+ switch (type) {
+ case COMPOSE_CC:
+ header = N_("Cc:");
+ break;
+ case COMPOSE_BCC:
+ header = N_("Bcc:");
+ break;
+ case COMPOSE_REPLYTO:
+ header = N_("Reply-To:");
+ break;
+ case COMPOSE_NEWSGROUPS:
+ header = N_("Newsgroups:");
+ break;
+ case COMPOSE_FOLLOWUPTO:
+ header = N_( "Followup-To:");
+ break;
+ case COMPOSE_TO:
+ default:
+ header = N_("To:");
+ break;
+ }
+ header = prefs_common.trans_hdr ? gettext(header) : header;
+
+ compose_add_header_entry(compose, header, (gchar *)address);
}
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},
- {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},
+ {"X-Mailing-List:", NULL, FALSE},
+ {"X-BeenThere:", 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_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
};
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 */
+ char * 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 */
+ char * 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_DRAFT)
+ if (compose->mode == COMPOSE_REEDIT)
compose->references = hentry[H_REFERENCES].body;
else {
compose->references = compose_parse_references
hentry[H_REFERENCES].body = NULL;
}
if (hentry[H_BCC].body != NULL) {
- if (compose->mode == COMPOSE_REEDIT_DRAFT) {
+ if (compose->mode == COMPOSE_REEDIT) {
conv_unmime_header_overwrite(hentry[H_BCC].body);
compose->bcc = hentry[H_BCC].body;
} else
hentry[H_FOLLOWUP_TO].body = NULL;
}
- if (compose->mode == COMPOSE_REEDIT_DRAFT && msginfo->inreplyto)
+ if (compose->mode == COMPOSE_REEDIT && msginfo->inreplyto)
compose->inreplyto = g_strdup(msginfo->inreplyto);
- else if (compose->mode != COMPOSE_REEDIT_DRAFT &&
+ else if (compose->mode != COMPOSE_REEDIT &&
msginfo->msgid && *msginfo->msgid) {
compose->inreplyto = g_strdup(msginfo->msgid);
str = msginfo->to;
sp++;
break;
+ case 'c':
+ str = msginfo->cc;
+ sp++;
+ break;
case 'i':
if (!msginfo->msgid) {sp++; break;}
Xalloca(str, strlen(msginfo->msgid) + 3,
g_return_if_fail(msginfo != NULL);
if ((compose->account->protocol != A_NNTP) || followup_and_reply_to)
- gtk_entry_set_text(GTK_ENTRY(compose->to_entry),
- ( (compose->replyto && !ignore_replyto)
+ compose_entry_append(compose,
+ ((compose->mailinglist && !ignore_replyto)
+ ? compose->mailinglist
+ : (compose->replyto && !ignore_replyto)
? compose->replyto
- : msginfo->from ? msginfo->from : ""));
+ : msginfo->from ? msginfo->from : ""),
+ COMPOSE_TO);
if (compose->account->protocol == A_NNTP)
- gtk_entry_set_text(GTK_ENTRY(compose->newsgroups_entry),
- compose->followup_to ? compose->followup_to
- : compose->newsgroups ? compose->newsgroups
- : "");
+ compose_entry_append(compose,
+ compose->followup_to ? compose->followup_to
+ : compose->newsgroups ? compose->newsgroups
+ : "",
+ COMPOSE_NEWSGROUPS);
if (msginfo->subject && *msginfo->subject) {
gchar *buf, *buf2, *p;
gtk_entry_set_text(GTK_ENTRY(compose->entry), str); \
}
+#define SET_ADDRESS(type, str) \
+{ \
+ if (str && *str) \
+ compose_entry_append(compose, str, type); \
+}
+
static void compose_reedit_set_entry(Compose *compose, MsgInfo *msginfo)
{
g_return_if_fail(msginfo != NULL);
- SET_ENTRY(to_entry, msginfo->to);
SET_ENTRY(subject_entry, msginfo->subject);
- SET_ENTRY(cc_entry, compose->cc);
- SET_ENTRY(bcc_entry, compose->bcc);
- SET_ENTRY(reply_entry, compose->replyto);
+ SET_ADDRESS(COMPOSE_TO, msginfo->to);
+ SET_ADDRESS(COMPOSE_CC, compose->cc);
+ SET_ADDRESS(COMPOSE_BCC, compose->bcc);
+ SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
+#if 0 /* NEW COMPOSE GUI */
if (compose->bcc) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
+#endif
}
#undef SET_ENTRY
+#undef SET_ADDRESS
+
+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;
+
+ if (strlen(sigfile) < 2)
+ return;
+
+ sigprg = popen(sigfile+1, "r");
+ if (sigprg) {
+
+ buf = g_malloc(buf_len);
+
+ if (!buf) {
+ gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
+ "Unable to insert signature (malloc failed)\n", -1);
+
+ pclose(sigprg);
+ return;
+ }
+
+ while (!feof(sigprg)) {
+ bzero(buf, buf_len);
+ fread(buf, buf_len-1, 1, sigprg);
+ gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, buf, -1);
+ }
+
+ g_free(buf);
+ pclose(sigprg);
+ }
+ else
+ {
+ gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
+ "Can't exec file: ", -1);
+ gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
+ sigfile+1, -1);
+ }
+}
static void compose_insert_sig(Compose *compose)
{
DEFAULT_SIGNATURE, NULL);
}
- if (!is_file_or_fifo_exist(sigfile)) {
+ if (!is_file_or_fifo_exist(sigfile) & (sigfile[0] != '|')) {
g_free(sigfile);
return;
}
"\n", 1);
}
- compose_insert_file(compose, sigfile);
+ if (sigfile[0] == '|')
+ {
+ compose_exec_sig(compose, sigfile);
+ }
+ else
+ {
+ compose_insert_file(compose, sigfile);
+ }
g_free(sigfile);
}
{
GtkSText *text = GTK_STEXT(compose->text);
gchar buf[BUFFSIZE];
+ gint len;
FILE *fp;
g_return_if_fail(file != NULL);
gtk_stext_freeze(text);
- while (fgets(buf, sizeof(buf), fp) != NULL)
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ /* Strip <CR> if DOS/Windoze file, replace <CR> with <LF> if MAC file */
+ len = strlen(buf);
+ if (len > 1 && buf[len - 2] == '\r' && buf[len - 1] == '\n') {
+ buf[len - 2] = '\n';
+ buf[len - 1] = '\0';
+ } else {
+ while (--len > 0)
+ if (buf[len] == '\r')
+ buf[len] = '\n';
+ }
+
+ gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ }
gtk_stext_thaw(text);
alertpanel_notice(_("File %s is empty\n"), file);
return;
}
-
+#if 0 /* NEW COMPOSE GUI */
if (!compose->use_attach) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
TRUE);
}
-
+#endif
ainfo = g_new0(AttachInfo, 1);
ainfo->file = g_strdup(file);
alertpanel_notice(_("File %s is empty\n"), file);
return;
}
-
+#if 0 /* NEW COMPOSE GUI */
if (!compose->use_attach) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
TRUE);
}
-
+#endif
ainfo = g_new0(AttachInfo, 1);
ainfo->file = g_strdup(file);
ainfo->encoding = ENC_BASE64;
ainfo->name = g_strdup(g_basename(file));
}
- ainfo->size = size;
+ ainfo->size = size;
+
+ compose_attach_info(compose, ainfo, cnttype);
+}
+
+static void compose_wrap_line(Compose *compose)
+{
+ GtkSText *text = GTK_STEXT(compose->text);
+ gint ch_len, last_ch_len;
+ gchar cbuf[MB_LEN_MAX], last_ch;
+ guint text_len;
+ guint line_end;
+ guint quoted;
+ gint p_start, p_end;
+ gint line_pos, cur_pos;
+ gint line_len, cur_len;
+
+#define GET_STEXT(pos) \
+ if (text->use_wchar) \
+ ch_len = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
+ else { \
+ cbuf[0] = GTK_STEXT_INDEX(text, (pos)); \
+ ch_len = 1; \
+ }
+
+ gtk_stext_freeze(text);
+
+ text_len = gtk_stext_get_length(text);
+
+ /* check to see if the point is on the paragraph mark (empty line). */
+ cur_pos = gtk_stext_get_point(text);
+ GET_STEXT(cur_pos);
+ if ((ch_len == 1 && *cbuf == '\n') || cur_pos == text_len) {
+ if (cur_pos == 0)
+ goto compose_end; /* on the paragraph mark */
+ GET_STEXT(cur_pos - 1);
+ if (ch_len == 1 && *cbuf == '\n')
+ goto compose_end; /* on the paragraph mark */
+ }
+
+ /* find paragraph start. */
+ line_end = quoted = 0;
+ for (p_start = cur_pos; p_start >= 0; --p_start) {
+ GET_STEXT(p_start);
+ if (ch_len == 1 && *cbuf == '\n') {
+ if (quoted)
+ goto compose_end; /* quoted part */
+ if (line_end) {
+ p_start += 2;
+ break;
+ }
+ line_end = 1;
+ } else {
+ if (ch_len == 1 && strchr(">:#", *cbuf))
+ quoted = 1;
+ else if (ch_len != 1 || !isspace(*cbuf))
+ quoted = 0;
+
+ line_end = 0;
+ }
+ }
+ if (p_start < 0)
+ p_start = 0;
+
+ /* find paragraph end. */
+ line_end = 0;
+ for (p_end = cur_pos; p_end < text_len; p_end++) {
+ GET_STEXT(p_end);
+ if (ch_len == 1 && *cbuf == '\n') {
+ if (line_end) {
+ p_end -= 1;
+ break;
+ }
+ line_end = 1;
+ } else {
+ if (line_end && ch_len == 1 && strchr(">:#", *cbuf))
+ goto compose_end; /* quoted part */
+
+ line_end = 0;
+ }
+ }
+ if (p_end >= text_len)
+ p_end = text_len;
+
+ if (p_start >= p_end)
+ goto compose_end;
+
+ line_len = cur_len = 0;
+ last_ch_len = 0;
+ last_ch = '\0';
+ line_pos = p_start;
+ for (cur_pos = p_start; cur_pos < p_end; cur_pos++) {
+ guint space = 0;
+
+ GET_STEXT(cur_pos);
+
+ if (ch_len < 0) {
+ cbuf[0] = '\0';
+ ch_len = 1;
+ }
+
+ if (ch_len == 1 && isspace(*cbuf))
+ space = 1;
+
+ if (ch_len == 1 && *cbuf == '\n') {
+ guint replace = 0;
+ if (last_ch_len == 1 && !isspace(last_ch)) {
+ if (cur_pos + 1 < p_end) {
+ GET_STEXT(cur_pos + 1);
+ if (ch_len == 1 && !isspace(*cbuf))
+ replace = 1;
+ }
+ }
+ gtk_stext_set_point(text, cur_pos + 1);
+ gtk_stext_backward_delete(text, 1);
+ if (replace) {
+ gtk_stext_set_point(text, cur_pos);
+ gtk_stext_insert(text, NULL, NULL, NULL, " ", 1);
+ space = 1;
+ }
+ else {
+ p_end--;
+ cur_pos--;
+ continue;
+ }
+ }
+
+ last_ch_len = ch_len;
+ last_ch = *cbuf;
+
+ if (space) {
+ line_pos = cur_pos + 1;
+ line_len = cur_len + ch_len;
+ }
+
+ if (cur_len + ch_len > prefs_common.linewrap_len &&
+ line_len > 0) {
+ gint tlen = ch_len;
+
+ GET_STEXT(line_pos - 1);
+ if (ch_len == 1 && isspace(*cbuf)) {
+ gtk_stext_set_point(text, line_pos);
+ gtk_stext_backward_delete(text, 1);
+ p_end--;
+ cur_pos--;
+ line_pos--;
+ cur_len--;
+ line_len--;
+ }
+ ch_len = tlen;
+
+ gtk_stext_set_point(text, line_pos);
+ gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ p_end++;
+ cur_pos++;
+ line_pos++;
+ cur_len = cur_len - line_len + ch_len;
+ line_len = 0;
+ continue;
+ }
+
+ if (ch_len > 1) {
+ line_pos = cur_pos + 1;
+ line_len = cur_len + ch_len;
+ }
+ cur_len += ch_len;
+ }
+
+compose_end:
+ gtk_stext_thaw(text);
+
+#undef GET_STEXT
+}
+
+/* return indent length */
+static guint get_indent_length(GtkSText *text, guint start_pos,
+ guint text_len) {
+ gint indent_len = 0;
+ gint i, ch_len;
+ gchar cbuf[MB_CUR_MAX];
+
+ for (i = start_pos; i < text_len; i++) {
+ if (text->use_wchar)
+ ch_len = wctomb
+ (cbuf, (wchar_t)GTK_STEXT_INDEX(text, i));
+ else {
+ cbuf[0] = GTK_STEXT_INDEX(text, i);
+ ch_len = 1;
+ }
+ if (ch_len > 1)
+ break;
+ /* allow space, tab, > or | */
+ if (cbuf[0] != ' ' && cbuf[0] != '\t' &&
+ cbuf[0] != '>' && cbuf[0] != '|')
+ break;
+ indent_len++;
+ }
+
+ return indent_len;
+}
+
+/* insert quotation string when line was wrapped, we know these
+ are single byte characters */
+static guint insert_quote(GtkSText *text, guint quote_len, guint indent_len,
+ guint prev_line_pos, guint text_len,
+ gchar *quote_fmt) {
+ guint i, ins_len;
+ gchar ch;
+
+ if (indent_len) {
+ for (i = 0; i < indent_len; i++) {
+ ch = GTK_STEXT_INDEX(text, prev_line_pos + i);
+ 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;
+ }
- compose_attach_info(compose, ainfo, cnttype);
+ return ins_len;
}
-static void compose_wrap_line(Compose *compose)
+/* compare gtkstext string at pos1 with string at pos2 for equality
+ (max. len chars) - we treat characters as single byte */
+static gint gtkstext_strncmp(GtkSText *text, guint pos1, guint pos2, guint len,
+ guint tlen)
+{
+ guint i = 0;
+ gchar ch1, ch2;
+
+ for (; (i < len) && (pos1 + i < tlen) && (pos2 + i < tlen); i++) {
+ ch1 = GTK_STEXT_INDEX(text, pos1 + i);
+ ch2 = GTK_STEXT_INDEX(text, pos2 + i);
+ if (ch1 != ch2)
+ break;
+ }
+
+ return i;
+}
+
+static void compose_wrap_line_all(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
guint text_len;
- guint line_pos = 0, cur_pos = 0;
+ guint line_pos = 0, cur_pos = 0, prev_line_pos = 0;
gint line_len = 0, cur_len = 0;
gint ch_len;
- gchar cbuf[MB_CUR_MAX];
+ gint is_new_line = 1, do_delete = 0;
+ guint quote_len = 0, indent_len = 0;
+ guint linewrap_quote = prefs_common.linewrap_quote;
+ guint linewrap_len = prefs_common.linewrap_len;
+ gchar *quote_fmt = prefs_common.quotemark;
+ gchar cbuf[MB_LEN_MAX];
gtk_stext_freeze(text);
+ /* make text buffer contiguous */
+ gtk_stext_compact_buffer(text);
+
text_len = gtk_stext_get_length(text);
for (; cur_pos < text_len; cur_pos++) {
+ if (linewrap_quote && is_new_line) {
+ quote_len = gtkstext_str_strcmp(text, cur_pos,
+ text_len, quote_fmt);
+ is_new_line = 0;
+ if (quote_len) {
+ indent_len = get_indent_length(text, cur_pos,
+ text_len);
+ }
+ else
+ indent_len = 0;
+ prev_line_pos = cur_pos;
+ }
if (text->use_wchar)
ch_len = wctomb
(cbuf, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
ch_len = 1;
}
+ /* fix line length for tabs */
+ if (ch_len == 1 && *cbuf == '\t') {
+ guint tab_width = text->default_tab_width;
+ guint tab_offset = line_len % tab_width;
+
+ if (tab_offset) {
+ line_len += tab_width - tab_offset - 1;
+ cur_len = line_len;
+ }
+ }
+
if (ch_len == 1 && *cbuf == '\n') {
+ gint clen;
+ guint ilen;
+ gchar cb[MB_CUR_MAX];
+
+ /* if it's just quotation + newline skip it */
+ if (indent_len && (cur_pos + 1 < text_len)) {
+ ilen = gtkstext_strncmp(text,
+ cur_pos + 1,
+ prev_line_pos,
+ indent_len,
+ text_len);
+ if (cur_pos + ilen < text_len) {
+ if (text->use_wchar)
+ clen = wctomb
+ (cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos + ilen + 1));
+ else {
+ cb[0] = GTK_STEXT_INDEX(text,
+ cur_pos + ilen + 1);
+ clen = 1;
+ }
+ if ((clen == 1) && (cb[0] == '\n'))
+ do_delete = 0;
+ }
+ }
+
+ /* should we delete to perform smart wrapping */
+ if (quote_len && line_len < linewrap_len && do_delete) {
+ /* 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 (indent_len) {
+ ilen = gtkstext_strncmp(text, cur_pos,
+ prev_line_pos,
+ indent_len,
+ text_len);
+ if (ilen) {
+ gtk_stext_forward_delete(text,
+ ilen);
+ text_len -= ilen;
+ }
+ }
+ else if (quote_len) {
+ if (gtkstext_str_strcmp(text, cur_pos,
+ text_len,
+ quote_fmt)) {
+ gtk_stext_forward_delete(text,
+ quote_len);
+ text_len-=quote_len;
+ }
+ }
+
+ if (text->use_wchar)
+ clen = wctomb
+ (cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
+ else {
+ cb[0] = GTK_STEXT_INDEX(text, cur_pos);
+ clen = 1;
+ }
+ /* insert space if it's alphanumeric */
+ if ((cur_pos != line_pos) &&
+ ((clen > 1) || isalnum(cb[0]))) {
+ gtk_stext_insert(text, NULL, NULL,
+ NULL, " ", 1);
+ gtk_stext_compact_buffer(text);
+ text_len++;
+ }
+
+ /* and start over with current line */
+ cur_pos = prev_line_pos - 1;
+ line_pos = cur_pos;
+ line_len = cur_len = 0;
+ quote_len = 0;
+ do_delete = 0;
+ is_new_line = 1;
+ continue;
+ }
+
line_pos = cur_pos + 1;
line_len = cur_len = 0;
+ quote_len = 0;
+ do_delete = 0;
+ is_new_line = 1;
continue;
}
line_len = cur_len + ch_len;
}
- if (cur_len + ch_len > prefs_common.linewrap_len &&
- line_len > 0) {
+ if (cur_len + ch_len > linewrap_len) {
gint tlen;
+ if (line_len == 0) {
+ /* don't wrap URLs */
+ if (is_url_string(text, line_pos, text_len))
+ continue;
+ line_len = cur_pos - line_pos;
+ line_pos = cur_pos;
+ }
+
if (text->use_wchar)
tlen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
else {
gtk_stext_set_point(text, line_pos);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ gtk_stext_compact_buffer(text);
text_len++;
cur_pos++;
line_pos++;
cur_len = cur_len - line_len + ch_len;
line_len = 0;
+ if (linewrap_quote && quote_len) {
+ /* only if line is not already quoted */
+ if (!gtkstext_str_strcmp(text, line_pos,
+ text_len, quote_fmt)) {
+ guint i_len;
+
+ i_len = insert_quote(text, quote_len,
+ indent_len,
+ prev_line_pos,
+ text_len,
+ quote_fmt);
+
+ gtk_stext_compact_buffer(text);
+ text_len += i_len;
+ /* for loop above will increase it */
+ cur_pos = line_pos - 1;
+ cur_len = 0;
+ line_len = 0;
+ /* start over with current line */
+ is_new_line = 1;
+ do_delete = 1;
+ }
+ }
continue;
}
return ac;
}
+gboolean compose_check_for_valid_recipient(Compose *compose) {
+ gchar *recipient_headers[] = {"To:", "Newsgroups:", "Cc:", "Bcc:", NULL};
+ gboolean recipient_found = FALSE;
+ GSList *list;
+ gchar **strptr;
+
+ for(list = compose->header_list; list; list = list->next) {
+ gchar *header;
+ gchar *entry;
+ header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(((compose_headerentry *)list->data)->combo)->entry));
+ entry = gtk_editable_get_chars(GTK_EDITABLE(((compose_headerentry *)list->data)->entry), 0, -1);
+ g_strstrip(entry);
+ if(entry[0] != '\0') {
+ for(strptr = recipient_headers; *strptr != NULL; strptr++) {
+ if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ recipient_found = TRUE;
+ }
+ }
+ }
+ g_free(entry);
+ }
+ return recipient_found;
+}
+
gint compose_send(Compose *compose)
{
gchar tmp[MAXPATHLEN + 1];
- gchar *to, *newsgroups;
gint ok = 0;
static gboolean lock = FALSE;
lock = TRUE;
- to = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- newsgroups = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*to == '\0' && *newsgroups == '\0') {
+ if(!compose_check_for_valid_recipient(compose)) {
alertpanel_error(_("Recipient is not specified."));
lock = FALSE;
return 1;
get_rc_dir(), G_DIR_SEPARATOR, (gint)compose);
if (prefs_common.linewrap_at_send)
- compose_wrap_line(compose);
+ compose_wrap_line_all(compose);
if (compose_write_to_file(compose, tmp, FALSE) < 0) {
lock = FALSE;
if (compose->to_list) {
PrefsAccount *ac;
- /*
+#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();
if (!ac) {
return -1;
}
}
- */
+#endif
ac = compose->account;
ok = send_message(tmp, ac, compose->to_list);
}
} else
alertpanel_error(_("Error occurred while sending the message."));
+ } else {
+ if (compose->mode == COMPOSE_REEDIT) {
+ compose_remove_reedit_target(compose);
+ if (compose->targetinfo)
+ folderview_update_item
+ (compose->targetinfo->folder, TRUE);
+ }
}
/* save message to outbox */
return ok;
}
+static gboolean compose_use_attach(Compose *compose) {
+ return(gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL);
+}
+
static gint compose_write_to_file(Compose *compose, const gchar *file,
gboolean is_draft)
{
len = strlen(chars);
if (is_ascii_str(chars)) {
buf = g_strdup(chars);
- out_codeset = "US-ASCII";
+ out_codeset = CS_US_ASCII;
encoding = ENC_7BIT;
} else {
const gchar *src_codeset;
out_codeset = conv_get_outgoing_charset_str();
- if (!strcasecmp(out_codeset, "US-ASCII"))
- out_codeset = "ISO-8859-1";
+ if (!strcasecmp(out_codeset, CS_US_ASCII))
+ out_codeset = CS_ISO_8859_1;
encoding = procmime_get_encoding_for_charset(out_codeset);
- debug_print("charset = %s, encoding = %s\n",
- out_codeset, procmime_get_encoding_str(encoding));
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 */
+ if (!strcasecmp(src_codeset, CS_US_ASCII))
+ src_codeset = out_codeset;
+
+ debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
+ src_codeset, out_codeset, procmime_get_encoding_str(encoding));
+
buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!buf) {
g_free(chars);
return -1;
}
- if (compose->use_attach) {
+ if (compose_use_attach(compose)) {
#if USE_GPGME
/* This prolog message is ignored by mime software and
* because it would make our signing/encryption task
}
g_free(buf);
- if (compose->use_attach)
+ if (compose_use_attach(compose))
compose_write_attach(compose, fp);
if (fclose(fp) == EOF) {
MsgInfo newmsginfo;
newmsginfo.msgnum = num;
- newmsginfo.flags = 0;
+ newmsginfo.flags.perm_flags = 0;
+ newmsginfo.flags.tmp_flags = 0;
procmsg_write_flags(&newmsginfo, fp);
fclose(fp);
}
return 0;
}
+static gint compose_remove_reedit_target(Compose *compose)
+{
+ FolderItem *item;
+ MsgInfo *msginfo = compose->targetinfo;
+
+ g_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
+ if (!msginfo) 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) {
+ g_warning(_("can't remove the old message\n"));
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
static gint compose_queue(Compose *compose, const gchar *file)
{
FolderItem *queue;
for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
fprintf(fp, ",<%s>", (gchar *)cur->data);
fprintf(fp, "\n");
+ /* Sylpheed account ID */
+ fprintf(fp, "AID:%d\n", compose->account->account_id);
fprintf(fp, "\n");
while (fgets(buf, sizeof(buf), src_fp) != NULL) {
}
queue = folder_get_default_queue();
+
folder_item_scan(queue);
queue_path = folder_item_get_path(queue);
if (!is_dir_exist(queue_path))
}
g_free(tmp);
+ if (compose->mode == COMPOSE_REEDIT) {
+ compose_remove_reedit_target(compose);
+ if (compose->targetinfo &&
+ compose->targetinfo->folder != queue)
+ folderview_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;
newmsginfo.msgnum = num;
- newmsginfo.flags = 0;
+ newmsginfo.flags.perm_flags = 0;
+ newmsginfo.flags.tmp_flags = 0;
procmsg_write_flags(&newmsginfo, fp);
fclose(fp);
}
(compose->account->add_customhdr && \
custom_header_find(compose->account->customhdr_list, header) != NULL)
+static gint compose_write_headers_from_headerlist(Compose *compose,
+ FILE *fp,
+ gchar *header,
+ GSList *(*list_append_func) (GSList *list, const gchar *str),
+ GSList **dest_list)
+{
+ gchar buf[BUFFSIZE];
+ gchar *str, *header_w_colon, *trans_hdr;
+ gboolean first_address;
+ GSList *list;
+ compose_headerentry *headerentry;
+
+ if (IS_IN_CUSTOM_HEADER(header)) {
+ return 0;
+ }
+
+ 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) {
+ headerentry = ((compose_headerentry *)list->data);
+ if(!strcmp(trans_hdr, gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)))) {
+ str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(str, str, return -1);
+ g_strstrip(str);
+ if(str[0] != '\0') {
+ if(list_append_func)
+ *dest_list = list_append_func(*dest_list, str);
+ compose_convert_header
+ (buf, sizeof(buf), str,
+ strlen(header) + 2);
+ if(first_address) {
+ fprintf(fp, "%s: ", header);
+ first_address = FALSE;
+ } else {
+ fprintf(fp, ", ");
+ }
+ fprintf(fp, "%s", buf);
+ }
+ }
+ }
+ if(!first_address) {
+ fprintf(fp, "\n");
+ }
+
+ g_free(header_w_colon);
+
+ return(0);
+}
+
static gint compose_write_headers(Compose *compose, FILE *fp,
const gchar *charset, EncodingType encoding,
gboolean is_draft)
get_rfc822_date(buf, sizeof(buf));
fprintf(fp, "Date: %s\n", buf);
}
-
+
/* From */
if (!IS_IN_CUSTOM_HEADER("From")) {
if (compose->account->name && *compose->account->name) {
compose->to_list = NULL;
/* To */
+ compose_write_headers_from_headerlist(compose, fp, "To", address_list_append, &compose->to_list);
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_to) {
str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
if (*str != '\0') {
}
}
}
-
+#endif
slist_free_strings(compose->newsgroup_list);
g_slist_free(compose->newsgroup_list);
compose->newsgroup_list = NULL;
/* Newsgroups */
+ compose_write_headers_from_headerlist(compose, fp, "Newsgroups", newsgroup_list_append, &compose->newsgroup_list);
+#if 0 /* NEW COMPOSE GUI */
str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
if (*str != '\0') {
Xstrdup_a(str, str, return -1);
}
}
}
-
- if (!is_draft && !compose->to_list && !compose->newsgroup_list)
- return -1;
-
+#endif
/* Cc */
+ compose_write_headers_from_headerlist(compose, fp, "Cc", address_list_append, &compose->to_list);
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_cc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
if (*str != '\0') {
}
}
}
-
+#endif
/* Bcc */
+ compose_write_headers_from_headerlist(compose, fp, "Bcc", address_list_append, &compose->to_list);
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_bcc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
if (*str != '\0') {
if (*str != '\0') {
compose->to_list = address_list_append
(compose->to_list, str);
- if (is_draft) {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen("Bcc: "));
- fprintf(fp, "Bcc: %s\n", buf);
- }
+ compose_convert_header(buf, sizeof(buf), str,
+ strlen("Bcc: "));
+ fprintf(fp, "Bcc: %s\n", buf);
}
}
}
+#endif
+ if (!is_draft && !compose->to_list && !compose->newsgroup_list)
+ return -1;
/* Subject */
str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
fprintf(fp, "References: %s\n", compose->references);
/* Followup-To */
+ compose_write_headers_from_headerlist(compose, fp, "Followup-To", NULL, NULL);
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_followupto && !IS_IN_CUSTOM_HEADER("Followup-To")) {
str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
if (*str != '\0') {
}
}
}
-
+#endif
/* Reply-To */
+ compose_write_headers_from_headerlist(compose, fp, "Reply-To", NULL, NULL);
+#if 0 /* NEW COMPOSE GUI */
if (compose->use_replyto && !IS_IN_CUSTOM_HEADER("Reply-To")) {
str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
if (*str != '\0') {
}
}
}
-
+#endif
/* Organization */
if (compose->account->organization &&
!IS_IN_CUSTOM_HEADER("Organization")) {
/* Program version and system info */
/* uname(&utsbuf); */
- str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- if (*str != '\0' && !IS_IN_CUSTOM_HEADER("X-Mailer")) {
+ if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer")) {
fprintf(fp, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
HOST_ALIAS);
/* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
- str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*str != '\0' && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
+ 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,
cur = cur->next) {
CustomHeader *chdr = (CustomHeader *)cur->data;
- if (strcasecmp(chdr->name, "Date") != 0 &&
- strcasecmp(chdr->name, "From") != 0 &&
- strcasecmp(chdr->name, "To") != 0 &&
- strcasecmp(chdr->name, "Sender") != 0 &&
- strcasecmp(chdr->name, "Message-Id") != 0 &&
- strcasecmp(chdr->name, "In-Reply-To") != 0 &&
- strcasecmp(chdr->name, "References") != 0 &&
- strcasecmp(chdr->name, "Mime-Version") != 0 &&
- strcasecmp(chdr->name, "Content-Type") != 0 &&
- strcasecmp(chdr->name, "Content-Transfer-Encoding")
- != 0)
+ if (strcasecmp(chdr->name, "Date") != 0 &&
+ strcasecmp(chdr->name, "From") != 0 &&
+ strcasecmp(chdr->name, "To") != 0 &&
+ strcasecmp(chdr->name, "Sender") != 0 &&
+ strcasecmp(chdr->name, "Message-Id") != 0 &&
+ strcasecmp(chdr->name, "In-Reply-To") != 0 &&
+ strcasecmp(chdr->name, "References") != 0 &&
+ strcasecmp(chdr->name, "Mime-Version") != 0 &&
+ strcasecmp(chdr->name, "Content-Type") != 0 &&
+ strcasecmp(chdr->name, "Content-Transfer-Encoding") != 0)
compose_convert_header
(buf, sizeof(buf),
chdr->value ? chdr->value : "",
strlen(chdr->name) + 2);
- fprintf(fp, "%s: %s\n", chdr->name, buf);
+ fprintf(fp, "%s: %s\n", chdr->name, buf);
}
}
-
+
/* MIME */
fprintf(fp, "Mime-Version: 1.0\n");
- if (compose->use_attach) {
+ if (compose_use_attach(compose)) {
get_rfc822_date(buf, sizeof(buf));
subst_char(buf, ' ', '_');
subst_char(buf, ',', '_');
g_free(addr);
}
+
static void compose_add_entry_field(GtkWidget *table, GtkWidget **hbox,
GtkWidget **entry, gint *count,
const gchar *label_str,
gtk_table_attach(GTK_TABLE(table), *hbox, 0, 1, *count, (*count) + 1,
GTK_FILL, 0, 2, 0);
*entry = gtk_entry_new();
- gtk_table_attach_defaults
- (GTK_TABLE(table), *entry, 1, 2, *count, (*count) + 1);
+ 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 Compose *compose_create(PrefsAccount *account)
+static void compose_create_header_entry(Compose *compose) {
+ gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
+
+ GtkWidget *combo;
+ GtkWidget *entry;
+ GList *combo_list = NULL;
+ gchar **string, *header;
+ compose_headerentry *headerentry = g_new0(compose_headerentry, 1);
+
+ /* Combo box */
+ combo = gtk_combo_new();
+ string = headers;
+ while(*string != NULL) {
+ combo_list = g_list_append(combo_list, (prefs_common.trans_hdr ? gettext(*string) : *string));
+ string++;
+ }
+ gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
+ g_list_free(combo_list);
+ gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), FALSE);
+ 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 {
+ switch(compose->account->protocol) {
+ case A_NNTP:
+ header = _("Newsgroups:");
+ break;
+ default:
+ header = _("To:");
+ break;
+ }
+ }
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
+
+ /* Entry field */
+ entry = gtk_entry_new();
+ gtk_widget_show(entry);
+ gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+
+ gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_cb), headerentry);
+ gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
+
+ address_completion_register_entry(GTK_ENTRY(entry));
+
+ headerentry->compose = compose;
+ headerentry->combo = combo;
+ headerentry->entry = entry;
+ headerentry->headernum = compose->header_nextrow;
+
+ compose->header_nextrow++;
+ compose->header_last = headerentry;
+}
+
+static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text) {
+ compose_headerentry *last_header;
+
+ last_header = compose->header_last;
+
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(last_header->combo)->entry), header);
+ gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
+}
+
+static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
{
Compose *compose;
GtkWidget *window;
GtkWidget *menubar;
GtkWidget *handlebox;
+ GtkWidget *notebook;
+
GtkWidget *vbox2;
GtkWidget *table_vbox;
GtkWidget *label;
GtkWidget *from_optmenu_hbox;
+#if 0 /* NEW COMPOSE GUI */
GtkWidget *to_entry;
GtkWidget *to_hbox;
GtkWidget *newsgroups_entry;
GtkWidget *newsgroups_hbox;
+#endif
+ GtkWidget *header_scrolledwin;
+ GtkWidget *header_table;
GtkWidget *subject_entry;
+#if 0 /* NEW COMPOSE GUI */
GtkWidget *cc_entry;
GtkWidget *cc_hbox;
GtkWidget *bcc_entry;
GtkWidget *reply_hbox;
GtkWidget *followup_entry;
GtkWidget *followup_hbox;
-
+#endif
GtkWidget *paned;
GtkWidget *attach_scrwin;
gint count = 0;
gint i;
+#if USE_PSPELL
+ GtkPspell * gtkpspell = NULL;
+#endif
+
g_return_val_if_fail(account != NULL, NULL);
debug_print(_("Creating compose window...\n"));
GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
gtk_widget_realize(window);
+ gtkut_widget_set_composer_icon(window);
+
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_container_set_border_width(GTK_CONTAINER(table_vbox),
BORDER_WIDTH * 2);
- table = gtk_table_new(8, 2, FALSE);
- gtk_box_pack_start(GTK_BOX(table_vbox), table, FALSE, TRUE, 0);
+ /* Notebook */
+ notebook = gtk_notebook_new();
+ gtk_widget_set_usize(notebook, -1, 180);
+ gtk_widget_show(notebook);
+
+ /* header labels and entries */
+ header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_show(header_scrolledwin);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), header_scrolledwin, gtk_label_new(_("Header")));
+
+ header_table = gtk_table_new(2, 2, FALSE);
+ gtk_widget_show(header_table);
+ gtk_container_set_border_width(GTK_CONTAINER(header_table), 2);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
+ count = 0;
/* option menu for selecting accounts */
hbox = gtk_hbox_new(FALSE, 0);
label = gtk_label_new(prefs_common.trans_hdr ? _("From:") : "From:");
gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(table), hbox, 0, 1, count, count + 1,
+ gtk_table_attach(GTK_TABLE(header_table), hbox, 0, 1, count, count + 1,
GTK_FILL, 0, 2, 0);
from_optmenu_hbox = compose_account_option_menu_create(compose);
- gtk_table_attach_defaults(GTK_TABLE(table), from_optmenu_hbox,
- 1, 2, count, count + 1);
+ gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
+ 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+#if 0 /* NEW COMPOSE GUI */
gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
+#endif
count++;
- /* header labels and entries */
+ /* Subject */
+ compose_add_entry_field(header_table, &hbox, &subject_entry, &count,
+ "Subject:", FALSE);
+
+ compose->header_table = header_table;
+ compose->header_list = NULL;
+ compose->header_nextrow = count;
+
+ compose_create_header_entry(compose);
+
+#if 0 /* NEW COMPOSE GUI */
compose_add_entry_field(table, &to_hbox, &to_entry, &count,
"To:", TRUE);
gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
compose_add_entry_field(table, &newsgroups_hbox, &newsgroups_entry,
&count, "Newsgroups:", FALSE);
gtk_table_set_row_spacing(GTK_TABLE(table), 1, 4);
- compose_add_entry_field(table, &hbox, &subject_entry, &count,
- "Subject:", FALSE);
+
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 4);
+
compose_add_entry_field(table, &cc_hbox, &cc_entry, &count,
"Cc:", TRUE);
gtk_table_set_row_spacing(GTK_TABLE(table), 3, 4);
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
gtk_signal_connect(GTK_OBJECT(followup_entry), "grab_focus",
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
+#endif
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), attach_scrwin, gtk_label_new(_("Attachments")));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
compose);
- /* pane between attach clist and text */
- paned = gtk_vpaned_new();
- gtk_paned_add1(GTK_PANED(paned), attach_scrwin);
- gtk_widget_ref(paned);
- gtk_widget_show_all(paned);
edit_vbox = gtk_vbox_new(FALSE, 0);
+#if 0 /* NEW COMPOSE GUI */
gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0);
+#endif
/* ruler */
ruler_hbox = gtk_hbox_new(FALSE, 0);
(GTK_SCROLLED_WINDOW(scrolledwin)),
gtk_scrolled_window_get_vadjustment
(GTK_SCROLLED_WINDOW(scrolledwin)));
+ GTK_STEXT(text)->default_tab_width = 8;
gtk_stext_set_editable(GTK_STEXT(text), TRUE);
- gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
- gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
+
+ if (prefs_common.block_cursor) {
+ GTK_STEXT(text)->cursor_type = STEXT_CURSOR_BLOCK;
+ }
+
+ if (prefs_common.smart_wrapping) {
+ gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
+ gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
+ }
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
compose);
-
+#if USE_PSPELL
+ if (prefs_common.enable_pspell) {
+ gtkpspell = gtkpspell_new_with_config(gtkpspellconfig,
+ prefs_common.pspell_path,
+ prefs_common.dictionary,
+ PSPELL_FASTMODE,
+ conv_get_current_charset_str());
+ if (gtkpspell == NULL)
+ prefs_common.enable_pspell = FALSE;
+ else
+ gtkpspell_attach(gtkpspell, GTK_STEXT(text));
+ }
+#endif
gtk_widget_show_all(vbox);
+ /* pane between attach clist and text */
+ paned = gtk_vpaned_new();
+ gtk_container_add(GTK_CONTAINER(vbox2), paned);
+ gtk_paned_add1(GTK_PANED(paned), notebook);
+ gtk_paned_add2(GTK_PANED(paned), edit_vbox);
+ gtk_widget_show_all(paned);
+
style = gtk_widget_get_style(text);
- /* workaround for the slow down of GtkSText when using Pixmap theme */
+ /* workaround for the slow down of GtkText when using Pixmap theme */
if (style->engine) {
GtkThemeEngine *engine;
menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
- /*
+#if 0 /* NEW COMPOSE GUI */
if (account->protocol == A_NNTP) {
gtk_widget_hide(to_hbox);
gtk_widget_hide(to_entry);
menu_set_sensitive(ifactory, "/Message/Followup to", FALSE);
}
- */
+#endif
switch (prefs_common.toolbar_style) {
case TOOLBAR_NONE:
compose->table_vbox = table_vbox;
compose->table = table;
+#if 0 /* NEW COMPOSE GUI */
compose->to_hbox = to_hbox;
compose->to_entry = to_entry;
compose->newsgroups_hbox = newsgroups_hbox;
compose->newsgroups_entry = newsgroups_entry;
+#endif
compose->subject_entry = subject_entry;
+#if 0 /* NEW COMPOSE GUI */
compose->cc_hbox = cc_hbox;
compose->cc_entry = cc_entry;
compose->bcc_hbox = bcc_hbox;
compose->reply_entry = reply_entry;
compose->followup_hbox = followup_hbox;
compose->followup_entry = followup_entry;
-
+#endif
compose->paned = paned;
compose->attach_scrwin = attach_scrwin;
compose->popupmenu = popupmenu;
compose->popupfactory = popupfactory;
- compose->mode = COMPOSE_NEW;
+ compose->mode = mode;
compose->replyto = NULL;
+ compose->mailinglist = NULL;
compose->cc = NULL;
compose->bcc = NULL;
compose->followup_to = NULL;
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, "/Message/To");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_set_sensitive(menuitem, FALSE);
}
- */
- if (account->set_autocc && account->auto_cc) {
+#endif
+ 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, "/Message/Cc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+#endif
}
-
if (account->set_autobcc) {
+ compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
+#if 0 /* NEW COMPOSE GUI */
compose->use_bcc = TRUE;
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- if (account->auto_bcc)
+ if (account->auto_bcc && mode != COMPOSE_REEDIT)
gtk_entry_set_text(GTK_ENTRY(bcc_entry),
account->auto_bcc);
+#endif
}
- if (account->set_autoreplyto) {
+ 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,
"/Message/Reply to");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- if (account->auto_replyto)
- gtk_entry_set_text(GTK_ENTRY(reply_entry),
- account->auto_replyto);
+ gtk_entry_set_text(GTK_ENTRY(reply_entry),
+ account->auto_replyto);
+#endif
+ }
+ if (account->protocol != A_NNTP) {
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("To:"));
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("Newsgroups:"));
}
menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
compose_list = g_list_append(compose_list, compose);
- /*
+#if 0 /* NEW COMPOSE GUI */
compose->use_to = FALSE;
compose->use_cc = FALSE;
- */
- compose->use_attach = 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_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);
}
#include "pixmaps/stock_mail_send.xpm"
+#include "pixmaps/stock_mail_send_queue.xpm"
#include "pixmaps/stock_mail.xpm"
#include "pixmaps/stock_paste.xpm"
#include "pixmaps/stock_mail_attach.xpm"
#include "pixmaps/stock_mail_compose.xpm"
#include "pixmaps/linewrap.xpm"
-//#include "pixmaps/tb_mail_queue_send.xpm"
#include "pixmaps/tb_address_book.xpm"
#define CREATE_TOOLBAR_ICON(xpm_d) \
"Send",
icon_wid, toolbar_send_cb, compose);
- CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
- //CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm);
+ CREATE_TOOLBAR_ICON(stock_mail_send_queue_xpm);
+ /* CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm); */
sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Send later"),
_("Put into queue folder and send later"),
CREATE_TOOLBAR_ICON(linewrap_xpm);
linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Linewrap"),
- _("Wrap long lines"),
+ _("Wrap current paragraph"),
"Linewrap",
icon_wid,
toolbar_linewrap_cb,
if (ac == compose->account) def_menu = num;
- name = g_strdup_printf("%s <%s> (%s)",
- ac->name, ac->address, ac->account_name);
+ name = g_strdup_printf("%s: %s <%s>",
+ ac->account_name, ac->name, ac->address);
MENUITEM_ADD(menu, menuitem, name, ac);
g_free(name);
gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
g_slist_free(compose->to_list);
slist_free_strings(compose->newsgroup_list);
g_slist_free(compose->newsgroup_list);
+ slist_free_strings(compose->header_list);
+ g_slist_free(compose->header_list);
procmsg_msginfo_free(compose->targetinfo);
GtkCList *clist = GTK_CLIST(compose->attach_clist);
AttachInfo *ainfo;
gint row;
- gboolean cancelled;
GtkOptionMenu *optmenu;
+ static gboolean cancelled;
if (!clist->selection) return;
row = GPOINTER_TO_INT(clist->selection->data);
GtkWidget *menu;
GtkWidget *menuitem;
- gtk_main();
+ cancelled = FALSE;
+ gtk_main();
if (cancelled == TRUE) {
gtk_widget_hide(attach_prop.window);
GtkWidget *hbbox;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
+ GList *mime_type_list, *strlist;
debug_print("Creating attach_property window...\n");
gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- SET_LABEL_AND_ENTRY(_("MIME type"), mimetype_entry, 0);
+ label = gtk_label_new(_("MIME type"));
+ gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, (0 + 1),
+ GTK_FILL, 0, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ mimetype_entry = gtk_combo_new();
+ gtk_table_attach(GTK_TABLE(table), mimetype_entry, 1, 2, 0, (0 + 1),
+ GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+ /* stuff with list */
+ mime_type_list = procmime_get_mime_type_list();
+ strlist = NULL;
+ for (; mime_type_list != NULL; mime_type_list = mime_type_list->next) {
+ MimeType *type = (MimeType *) mime_type_list->data;
+ strlist = g_list_append(strlist,
+ g_strdup_printf("%s/%s",
+ type->type, type->sub_type));
+ }
+
+ gtk_combo_set_popdown_strings(GTK_COMBO(mimetype_entry), strlist);
+
+ for (mime_type_list = strlist; mime_type_list != NULL;
+ mime_type_list = mime_type_list->next)
+ g_free(mime_type_list->data);
+ g_list_free(strlist);
+
+ mimetype_entry = GTK_COMBO(mimetype_entry)->entry;
label = gtk_label_new(_("Encoding"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
sensitive);
menu_set_sensitive(ifactory, "/File/Insert file", sensitive);
menu_set_sensitive(ifactory, "/File/Insert signature", sensitive);
- menu_set_sensitive(ifactory, "/Edit/Wrap long lines", sensitive);
+ menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", sensitive);
+ menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", sensitive);
menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
sensitive);
static void select_account(Compose * compose, PrefsAccount * ac)
{
- compose->account = ac;
- compose_set_title(compose);
+ 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),
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_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),
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);
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);
3, 4);
}
gtk_widget_queue_resize(compose->table_vbox);
+#endif
}
static void account_activated(GtkMenuItem *menuitem, gpointer data)
{
Compose *compose = (Compose *)data;
gchar tmp[22];
- gchar *to, *newsgroups;
+ gboolean recipient_found;
+ GSList *list;
- to = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- newsgroups = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*to == '\0' && *newsgroups == '\0') {
+ if(!compose_check_for_valid_recipient(compose)) {
alertpanel_error(_("Recipient is not specified."));
return;
}
g_get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
if (prefs_common.linewrap_at_send)
- compose_wrap_line(compose);
+ compose_wrap_line_all(compose);
if (compose_write_to_file(compose, tmp, FALSE) < 0 ||
compose_queue(compose, tmp) < 0) {
gchar *tmp;
draft = folder_get_default_draft();
- folder_item_scan(draft);
- if (procmsg_msg_exist(compose->targetinfo) &&
- compose->targetinfo->folder == draft) {
- if (folder_item_remove_msg(draft,
- compose->targetinfo->msgnum) < 0)
- g_warning(_("can't remove the old draft message\n"));
- }
- tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
+ tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
G_DIR_SEPARATOR, (gint)compose);
if (compose_write_to_file(compose, tmp, TRUE) < 0) {
return;
}
+ folder_item_scan(draft);
if (folder_item_add_msg(draft, tmp, TRUE) < 0) {
unlink(tmp);
g_free(tmp);
return;
}
-
g_free(tmp);
- //folderview_scan_folder_a(DRAFT_DIR, TRUE);
+ if (compose->mode == COMPOSE_REEDIT) {
+ compose_remove_reedit_target(compose);
+ if (compose->targetinfo &&
+ compose->targetinfo->folder != draft)
+ folderview_update_item(compose->targetinfo->folder,
+ TRUE);
+ }
+
+ folder_item_scan(draft);
+ folderview_update_item(draft, TRUE);
gtk_widget_destroy(compose->window);
}
static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
- gchar *file;
+ GList *file_list;
+
+ file_list = filesel_select_multiple_files(_("Select file"), NULL);
- file = filesel_select_file(_("Select file"), NULL);
+ if (file_list) {
+ GList *tmp;
- if (file)
- compose_attach_append(compose, file, MIME_UNKNOWN);
+ for ( tmp = file_list; tmp; tmp = tmp->next) {
+ gchar *file = (gchar *) tmp->data;
+ compose_attach_append(compose, file, MIME_UNKNOWN);
+ g_free(file);
+ }
+ g_list_free(file_list);
+ }
}
static void compose_insert_file_cb(gpointer data, guint action,
GtkWidget *widget)
{
Compose *compose = (Compose *)data;
- gchar *file;
+ GList *file_list;
- file = filesel_select_file(_("Select file"), NULL);
+ file_list = filesel_select_multiple_files(_("Select file"), NULL);
- if (file)
- compose_insert_file(compose, file);
+ if (file_list) {
+ GList *tmp;
+
+ for ( tmp = file_list; tmp; tmp = tmp->next) {
+ gchar *file = (gchar *) tmp->data;
+ compose_insert_file(compose, file);
+ g_free(file);
+ }
+ g_list_free(file_list);
+ }
}
static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
return;
}
}
-
+#if USE_PSPELL
+ if (compose->gtkpspell) {
+ gtkpspell_detach(compose->gtkpspell);
+ compose->gtkpspell = gtkpspell_delete(compose->gtkpspell);
+ }
+#endif
gtk_widget_destroy(compose->window);
}
}
#endif
+#if 0 /* NEW COMPOSE GUI */
static void compose_toggle_to_cb(gpointer data, guint action,
GtkWidget *widget)
{
compose->use_attach = FALSE;
}
}
+#endif
#if USE_GPGME
static void compose_toggle_sign_cb(gpointer data, guint action,
g_list_free(list);
}
+#if 0 /* NEW COMPOSE GUI */
static void to_activated(GtkWidget *widget, Compose *compose)
{
if (GTK_WIDGET_VISIBLE(compose->newsgroups_entry))
{
gtk_widget_grab_focus(compose->text);
}
+#endif
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget)
return quote_fmt_get_buffer();
}
+
+static void template_apply_cb(gchar *s, gpointer data)
+{
+ Compose *compose = (Compose*)data;
+ GtkSText *text = GTK_STEXT(compose->text);
+ gchar *quote_str;
+ gchar *qmark;
+ gchar *parsed_text;
+ gchar *tmpl;
+ gchar *old_tmpl = s;
+
+ if(!s) return;
+
+ if(compose->replyinfo == NULL) {
+ gtk_stext_freeze(text);
+ gtk_stext_set_point(text, 0);
+ gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+ gtk_stext_insert(text, NULL, NULL, NULL, s, -1);
+ gtk_stext_thaw(text);
+ g_free(old_tmpl);
+ return;
+ }
+
+ parsed_text = g_new(gchar, strlen(s)*2 + 1);
+ tmpl = parsed_text;
+ while(*s) {
+ if (*s == '\n') {
+ *parsed_text++ = '\\';
+ *parsed_text++ = 'n';
+ s++;
+ } else {
+ *parsed_text++ = *s++;
+ }
+ }
+ *parsed_text = '\0';
+
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
+
+ quote_str = compose_quote_fmt(compose, compose->replyinfo, tmpl, qmark);
+ if (quote_str != NULL) {
+ gtk_stext_freeze(text);
+ gtk_stext_set_point(text, 0);
+ gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+ gtk_stext_insert(text, NULL, NULL, NULL, quote_str, -1);
+ gtk_stext_thaw(text);
+ }
+
+ g_free(old_tmpl);
+ g_free(tmpl);
+}
+
+static void template_select_cb(gpointer data, guint action,
+ GtkWidget *widget)
+{
+ template_select(&template_apply_cb, data);
+}
+
+void compose_headerentry_key_press_event_cb(GtkWidget *entry, GdkEventKey *event, compose_headerentry *headerentry) {
+ if((g_slist_length(headerentry->compose->header_list) > 0) &&
+ ((headerentry->headernum + 1) != headerentry->compose->header_nextrow) &&
+ !(event->state & GDK_MODIFIER_MASK) &&
+ (event->keyval == GDK_BackSpace) &&
+ (strlen(gtk_entry_get_text(GTK_ENTRY(entry))) == 0)) {
+ gtk_container_remove(GTK_CONTAINER(headerentry->compose->header_table), headerentry->combo);
+ gtk_container_remove(GTK_CONTAINER(headerentry->compose->header_table), headerentry->entry);
+ headerentry->compose->header_list = g_slist_remove(headerentry->compose->header_list, headerentry);
+ g_free(headerentry);
+ }
+}
+
+void compose_headerentry_changed_cb(GtkWidget *entry, compose_headerentry *headerentry) {
+ if(strlen(gtk_entry_get_text(GTK_ENTRY(entry))) != 0) {
+ headerentry->compose->header_list = g_slist_append(headerentry->compose->header_list, headerentry);
+ compose_create_header_entry(headerentry->compose);
+ gtk_signal_disconnect_by_func(GTK_OBJECT(entry), GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
+ }
+}
projects / claws.git / blobdiff