/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "folder.h"
#include "addr_compl.h"
#include "quote_fmt.h"
-#include "template.h"
#include "undo.h"
#include "foldersel.h"
#include "toolbar.h"
#include "inc.h"
+#include "message_search.h"
+#include "combobox.h"
+
enum
{
COL_MIMETYPE = 0,
GList *listAddress );
static Compose *compose_create (PrefsAccount *account,
- ComposeMode mode);
+ ComposeMode mode,
+ gboolean batch);
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
gboolean check_subject);
static gint compose_write_to_file (Compose *compose,
FILE *fp,
- gint action);
+ gint action,
+ gboolean attach_parts);
static gint compose_write_body_to_file (Compose *compose,
const gchar *file);
-static gint compose_remove_reedit_target (Compose *compose);
+static gint compose_remove_reedit_target (Compose *compose,
+ gboolean force);
void compose_remove_draft (Compose *compose);
-static gint compose_queue (Compose *compose,
- gint *msgnum,
- FolderItem **item);
static gint compose_queue_sub (Compose *compose,
gint *msgnum,
FolderItem **item,
- gboolean check_subject);
+ gchar **msgpath,
+ gboolean check_subject,
+ gboolean remove_reedit_target);
static void compose_add_attachments (Compose *compose,
MimeInfo *parent);
static gchar *compose_get_header (Compose *compose);
static void compose_create_header_entry (Compose *compose);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
static void compose_update_priority_menu_item(Compose * compose);
-
+#if USE_ASPELL
+static void compose_spell_menu_changed (void *data);
+#endif
static void compose_add_field_list ( Compose *compose,
GList *listAddress );
static gboolean compose_edit_size_alloc (GtkEditable *widget,
GtkAllocation *allocation,
GtkSHRuler *shruler);
-static void account_activated (GtkMenuItem *menuitem,
+static void account_activated (GtkComboBox *optmenu,
gpointer data);
static void attach_selected (GtkTreeView *tree_view,
GtkTreePath *tree_path,
static void compose_wrap_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_find_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
static void compose_toggle_autowrap_cb (gpointer data,
guint action,
GtkWidget *widget);
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
-static gboolean compose_close (Compose *compose);
-
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
{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>B",
+ "<shift><control>B",
compose_advanced_action_cb,
COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Move a character forward"),
- "<control>F",
+ "<shift><control>F",
compose_advanced_action_cb,
COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
NULL},
COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END,
NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit/_Find"),
+ "<control>F", compose_find_cb, 0, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/_Wrap current paragraph"),
"<control>L", compose_wrap_cb, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
NULL, compose_check_backwards , 0, NULL},
{N_("/_Spelling/_Forward to next misspelled word"),
NULL, compose_check_forwards_go, 0, NULL},
+ {N_("/_Spelling/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Spelling/Options"),
+ NULL, NULL, 0, "<Branch>"},
#endif
{N_("/_Options"), NULL, NULL, 0, "<Branch>"},
{N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
ENC_ACTION(C_WINDOWS_1255)},
{N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/Character _encoding/Arabic (ISO-8859-_6)"),
+ ENC_ACTION(C_ISO_8859_6)},
+ {N_("/_Options/Character _encoding/Arabic (Windows-1256)"),
+ ENC_ACTION(C_CP1256)},
+ {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
+
{N_("/_Options/Character _encoding/Turkish (ISO-8859-_9)"),
ENC_ACTION(C_ISO_8859_9)},
{N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
static GtkTargetEntry compose_mime_types[] =
{
{"text/uri-list", 0, 0},
- {"text/plain", 0, 0},
- {"STRING", 0, 0}
+ {"UTF8_STRING", 0, 0},
+ {"text/plain", 0, 0}
};
static gboolean compose_put_existing_to_front(MsgInfo *info)
return FALSE;
}
-static GdkColor quote_color =
+static GdkColor quote_color1 =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_color2 =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_color3 =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+
+static GdkColor quote_bgcolor1 =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_bgcolor2 =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+static GdkColor quote_bgcolor3 =
{(gulong)0, (gushort)0, (gushort)0, (gushort)0};
static GdkColor signature_color = {
{
GtkTextBuffer *buffer;
GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+ GdkColormap *cmap;
+ GdkColor color[8];
+ gboolean success[8];
+ int i;
buffer = gtk_text_view_get_buffer(text);
-
+
if (prefs_common.enable_color) {
/* grab the quote colors, converting from an int to a GdkColor */
gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_col,
- "e_color);
+ "e_color1);
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level2_col,
+ "e_color2);
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level3_col,
+ "e_color3);
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_bgcol,
+ "e_bgcolor1);
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level2_bgcol,
+ "e_bgcolor2);
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level3_bgcol,
+ "e_bgcolor3);
gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
&signature_color);
gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
&uri_color);
} else {
- signature_color = quote_color = uri_color = black;
+ signature_color = quote_color1 = quote_color2 = quote_color3 =
+ quote_bgcolor1 = quote_bgcolor2 = quote_bgcolor3 = uri_color = black;
+ }
+
+ if (prefs_common.enable_color && prefs_common.enable_bgcolor) {
+ gtk_text_buffer_create_tag(buffer, "quote0",
+ "foreground-gdk", "e_color1,
+ "paragraph-background-gdk", "e_bgcolor1,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "quote1",
+ "foreground-gdk", "e_color2,
+ "paragraph-background-gdk", "e_bgcolor2,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "quote2",
+ "foreground-gdk", "e_color3,
+ "paragraph-background-gdk", "e_bgcolor3,
+ NULL);
+ } else {
+ gtk_text_buffer_create_tag(buffer, "quote0",
+ "foreground-gdk", "e_color1,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "quote1",
+ "foreground-gdk", "e_color2,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "quote2",
+ "foreground-gdk", "e_color3,
+ NULL);
}
-
- gtk_text_buffer_create_tag(buffer, "quote",
- "foreground-gdk", "e_color,
- NULL);
+
gtk_text_buffer_create_tag(buffer, "signature",
"foreground-gdk", &signature_color,
NULL);
gtk_text_buffer_create_tag(buffer, "link",
- "foreground-gdk", &uri_color,
+ "foreground-gdk", &uri_color,
NULL);
compose->no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
compose->no_join_tag = gtk_text_buffer_create_tag(buffer, "no_join", NULL);
+
+ color[0] = quote_color1;
+ color[1] = quote_color2;
+ color[2] = quote_color3;
+ color[3] = quote_bgcolor1;
+ color[4] = quote_bgcolor2;
+ color[5] = quote_bgcolor3;
+ color[6] = signature_color;
+ color[7] = uri_color;
+ cmap = gdk_drawable_get_colormap(compose->window->window);
+ gdk_colormap_alloc_colors(cmap, color, 8, FALSE, TRUE, success);
+
+ for (i = 0; i < 8; i++) {
+ if (success[i] == FALSE) {
+ GtkStyle *style;
+
+ g_warning("Compose: color allocation failed.\n");
+ style = gtk_widget_get_style(GTK_WIDGET(text));
+ quote_color1 = quote_color2 = quote_color3 =
+ quote_bgcolor1 = quote_bgcolor2 = quote_bgcolor3 =
+ signature_color = uri_color = black;
+ }
+ }
}
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
if (!account) account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_NEW);
+ compose = compose_create(account, COMPOSE_NEW, FALSE);
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose->replyinfo = NULL;
compose->gtkaspell)
gtkaspell_change_dict(compose->gtkaspell,
item->prefs->default_dictionary);
+ compose_spell_menu_changed(compose);
#endif
if (account->auto_sig)
} else {
if (mailto) {
compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
- } else if (item) {
+ } else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
}
/*
case COMPOSE_FORWARD_INLINE:
/* check if we reply to more than one Message */
if (list_len == 1) {
- compose = compose_forward(NULL, msginfo, FALSE, body, FALSE);
+ compose = compose_forward(NULL, msginfo, FALSE, body, FALSE, FALSE);
break;
}
/* more messages FALL THROUGH */
compose = compose_forward_multiple(NULL, msginfo_list);
break;
case COMPOSE_REDIRECT:
- compose = compose_redirect(NULL, msginfo);
+ compose = compose_redirect(NULL, msginfo, FALSE);
break;
default:
g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
} else
reply_account = account;
- compose = compose_create(account, COMPOSE_REPLY);
+ compose = compose_create(account, COMPOSE_REPLY, FALSE);
+
+ compose->updating = TRUE;
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_active(ifactory, "/Options/Remove references", FALSE);
menu_set_sensitive(ifactory, "/Options/Remove references", TRUE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
-
if (!compose->replyinfo)
compose->replyinfo = procmsg_msginfo_copy(msginfo);
-
+
compose_extract_original_charset(compose);
if (msginfo->folder && msginfo->folder->ret_rcpt)
compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
qmark, body, FALSE);
+ quote_fmt_reset_vartable();
}
if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
compose_force_encryption(compose, account, FALSE);
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
return compose;
}
Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
gboolean as_attach, const gchar *body,
- gboolean no_extedit)
+ gboolean no_extedit,
+ gboolean batch)
{
Compose *compose;
GtkTextView *textview;
(msginfo)))
account = cur_account;
- compose = compose_create(account, COMPOSE_FORWARD);
+ compose = compose_create(account, COMPOSE_FORWARD, batch);
+ compose->updating = TRUE;
compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->fwdinfo)
compose->fwdinfo = procmsg_msginfo_copy(msginfo);
compose_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
qmark, body, FALSE);
+ quote_fmt_reset_vartable();
compose_attach_parts(compose, msginfo);
procmsg_msginfo_free(full_msginfo);
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
return compose;
}
MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
}
- compose = compose_create(account, COMPOSE_FORWARD);
+ compose = compose_create(account, COMPOSE_FORWARD, FALSE);
+
+ compose->updating = TRUE;
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
undo_block(compose->undostruct);
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
undo_unblock(compose->undostruct);
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
return compose;
}
}
}
-void compose_reedit(MsgInfo *msginfo)
+Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
{
Compose *compose = NULL;
PrefsAccount *account = NULL;
gboolean use_signing = FALSE;
gboolean use_encryption = FALSE;
gchar *privacy_system = NULL;
+ int priority = PRIORITY_NORMAL;
+ MsgInfo *replyinfo = NULL, *fwdinfo = NULL;
- g_return_if_fail(msginfo != NULL);
- g_return_if_fail(msginfo->folder != NULL);
+ g_return_val_if_fail(msginfo != NULL, NULL);
+ g_return_val_if_fail(msginfo->folder != NULL, NULL);
- if (compose_put_existing_to_front(msginfo))
- return;
+ if (compose_put_existing_to_front(msginfo)) {
+ return NULL;
+ }
if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Priority: ")) {
param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
- compose->priority = param;
+ priority = param;
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "RMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("RMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ replyinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "FMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("FMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ fwdinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
}
- } else
+ } else {
account = msginfo->folder->folder->account;
+ }
if (!account && prefs_common.reedit_account_autosel) {
gchar from[BUFFSIZE];
- if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
+ if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")) {
extract_address(from);
account = account_find_from_address(from);
}
}
- if (!account) account = cur_account;
- g_return_if_fail(account != NULL);
+ if (!account) {
+ account = cur_account;
+ }
+ g_return_val_if_fail(account != NULL, NULL);
+
+ compose = compose_create(account, COMPOSE_REEDIT, batch);
+
+ compose->replyinfo = replyinfo;
+ compose->fwdinfo = fwdinfo;
+
+ compose->updating = TRUE;
+ compose->priority = priority;
- compose = compose_create(account, COMPOSE_REEDIT);
if (privacy_system != NULL) {
compose->privacy_system = privacy_system;
compose_use_signing(compose, use_signing);
} else {
activate_privacy_system(compose, account, FALSE);
}
+
compose->targetinfo = procmsg_msginfo_copy(msginfo);
compose_extract_original_charset(compose);
}
}
- if (compose_parse_header(compose, msginfo) < 0) return;
+ if (compose_parse_header(compose, msginfo) < 0) {
+ compose->updating = FALSE;
+ compose_destroy(compose);
+ return NULL;
+ }
compose_reedit_set_entry(compose, msginfo);
textview = GTK_TEXT_VIEW(compose->text);
if (procmime_msginfo_is_encrypted(msginfo)) {
fp = procmime_get_first_encrypted_text_content(msginfo);
- if (fp)
+ if (fp) {
compose_force_encryption(compose, account, TRUE);
- } else
+ }
+ } else {
fp = procmime_get_first_text_content(msginfo);
- if (fp == NULL)
+ }
+ if (fp == NULL) {
g_warning("Can't get text part\n");
+ }
if (fp != NULL) {
gboolean prev_autowrap = compose->autowrap;
gtk_widget_grab_focus(compose->text);
- if (prefs_common.auto_exteditor)
+ if (prefs_common.auto_exteditor) {
compose_exec_ext_editor(compose);
+ }
compose->modified = FALSE;
compose_set_title(compose);
+
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
+ compose->sig_str = compose_get_signature_str(compose);
+
+ return compose;
}
-Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
+Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
+ gboolean batch)
{
Compose *compose;
gchar *filename;
prefs_common.reply_account_autosel);
g_return_val_if_fail(account != NULL, NULL);
- compose = compose_create(account, COMPOSE_REDIRECT);
+ compose = compose_create(account, COMPOSE_REDIRECT, batch);
+
+ compose->updating = TRUE;
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
compose_create_tags(GTK_TEXT_VIEW(compose->text), compose);
compose->replyinfo = NULL;
gtk_widget_grab_focus(compose->header_last->entry);
filename = procmsg_get_message_file_path(msginfo);
- if (filename == NULL)
+
+ if (filename == NULL) {
+ compose->updating = FALSE;
+ compose_destroy(compose);
+
return NULL;
+ }
compose->redirect_filename = filename;
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE);
+ quote_fmt_reset_vartable();
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
compose_colorize_signature(compose);
menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
- gtk_widget_set_sensitive(compose->toolbar->draft_btn, 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_current_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+ if (compose->toolbar->draft_btn)
+ gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
+ if (compose->toolbar->insert_btn)
+ gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
+ if (compose->toolbar->attach_btn)
+ gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
+ if (compose->toolbar->sig_btn)
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
+ if (compose->toolbar->exteditor_btn)
+ gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
+ if (compose->toolbar->linewrap_current_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+ if (compose->toolbar->linewrap_all_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
compose->modified = FALSE;
compose_set_title(compose);
- return compose;
+ compose->updating = FALSE;
+
+ if (compose->deferred_destroy) {
+ compose_destroy(compose);
+ return NULL;
+ }
+
+ return compose;
}
GList *compose_get_compose_list(void)
tmp[cur-begin]='\0';
cur++;
begin = cur;
- while (*tmp == ' ')
+ while (*tmp == ' ' || *tmp == '\t')
tmp++;
compose_add_header_entry(compose, header, tmp);
g_free(o_tmp);
tmp[cur-begin]='\0';
cur++;
begin = cur;
- while (*tmp == ' ')
+ while (*tmp == ' ' || *tmp == '\t')
tmp++;
compose_add_header_entry(compose, header, tmp);
g_free(o_tmp);
void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
- static GtkStyle *bold_style = NULL;
- static GdkColor bold_color;
+ static GdkColor yellow;
+ static GdkColor black;
+ static gboolean yellow_initialised = FALSE;
GSList *h_list;
GtkEntry *entry;
+ if (!yellow_initialised) {
+ gdk_color_parse("#f5f6be", &yellow);
+ gdk_color_parse("#000000", &black);
+ yellow_initialised = gdk_colormap_alloc_color(
+ gdk_colormap_get_system(), &yellow, FALSE, TRUE);
+ yellow_initialised &= gdk_colormap_alloc_color(
+ gdk_colormap_get_system(), &black, FALSE, TRUE);
+ }
+
for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
if (gtk_entry_get_text(entry) &&
!g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
- gtk_widget_ensure_style(GTK_WIDGET(entry));
- if (!bold_style) {
- gtkut_convert_int_to_gdk_color
- (prefs_common.color_new, &bold_color);
- bold_style = gtk_style_copy(gtk_widget_get_style
- (GTK_WIDGET(entry)));
- pango_font_description_set_weight
- (bold_style->font_desc, PANGO_WEIGHT_BOLD);
- bold_style->fg[GTK_STATE_NORMAL] = bold_color;
+ if (yellow_initialised) {
+ gtk_widget_modify_base(
+ GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+ GTK_STATE_NORMAL, &yellow);
+ gtk_widget_modify_text(
+ GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+ GTK_STATE_NORMAL, &black);
}
- gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
}
}
}
gchar *subject = NULL;
gchar *body = NULL;
gchar *temp = NULL;
- gint len = 0;
+ guint len = 0;
scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body);
} else {
gchar *tmpout = NULL;
tmpout = conv_codeset_strdup
- (buf, conv_get_locale_charset_str(),
+ (buf, conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
if (!tmpout || !g_utf8_validate(tmpout, -1, NULL)) {
g_free(tmpout);
msginfo->folder->prefs->default_reply_to);
} else {
gchar *tmp1 = NULL;
+ if (!msginfo->from)
+ return;
Xstrdup_a(tmp1, msginfo->from, return);
extract_address(tmp1);
if (to_all || to_sender ||
if (msginfo->subject && *msginfo->subject) {
gchar *buf, *buf2;
- guchar *p;
+ gchar *p;
buf = p = g_strdup(msginfo->subject);
p += subject_get_prefix_length(p);
g_return_if_fail(msginfo != NULL);
SET_ENTRY(subject_entry, msginfo->subject);
+ SET_ENTRY(from_name, msginfo->from);
SET_ADDRESS(COMPOSE_TO, msginfo->to);
SET_ADDRESS(COMPOSE_CC, compose->cc);
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
GtkTextMark *mark;
GtkTextIter iter, iter_end;
gint cur_pos;
+ gchar *search = NULL;
gboolean prev_autowrap;
+ gboolean found = FALSE, shift = FALSE;
g_return_if_fail(compose->account != NULL);
gtk_text_buffer_get_end_iter(buffer, &iter);
- if (replace && compose->sig_str) {
- gboolean found;
+ search = compose->sig_str;
+again:
+ if (replace && search) {
GtkTextIter first_iter, start_iter, end_iter;
gtk_text_buffer_get_start_iter(buffer, &first_iter);
found = FALSE;
else
found = gtk_text_iter_forward_search(&first_iter,
- compose->sig_str,
+ search,
GTK_TEXT_SEARCH_TEXT_ONLY,
&start_iter, &end_iter,
NULL);
gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
iter = start_iter;
}
+ }
+ if (replace && !found && search && strlen(search) > 2
+ && search[0] == '\n' && search[1] == '\n') {
+ search ++;
+ shift = TRUE;
+ goto again;
}
g_free(compose->sig_str);
compose->sig_str = g_strdup("");
cur_pos = gtk_text_iter_get_offset(&iter);
- gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+ if (shift && found)
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str + 1, -1);
+ else
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
/* skip \n\n */
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
gtk_text_iter_forward_char(&iter);
utf8_sig_str = sig_str;
else {
utf8_sig_str = conv_codeset_strdup
- (sig_str, conv_get_locale_charset_str(),
+ (sig_str, conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
g_free(sig_str);
}
G_CALLBACK(text_inserted),
compose);
- cur_encoding = conv_get_locale_charset_str();
+ cur_encoding = conv_get_locale_charset_str_no_utf8();
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar *str;
gchar *size_text;
GtkListStore *store;
gchar *name;
+ gboolean has_binary = FALSE;
if (!is_file_exist(file)) {
g_warning("File %s doesn't exist\n", filename);
MsgInfo *msginfo;
MsgFlags flags = {0, 0};
- if (procmime_get_encoding_for_text_file(file) == ENC_7BIT)
+ if (procmime_get_encoding_for_text_file(file, &has_binary) == ENC_7BIT)
ainfo->encoding = ENC_7BIT;
else
ainfo->encoding = ENC_8BIT;
procmsg_msginfo_free(msginfo);
} else {
if (!g_ascii_strncasecmp(content_type, "text", 4))
- ainfo->encoding = procmime_get_encoding_for_text_file(file);
+ ainfo->encoding = procmime_get_encoding_for_text_file(file, &has_binary);
else
ainfo->encoding = ENC_BASE64;
name = g_path_get_basename(filename ? filename : file);
ainfo->encoding = ENC_BASE64;
} else if (!g_ascii_strncasecmp(ainfo->content_type, "text", 4))
ainfo->encoding =
- procmime_get_encoding_for_text_file(file);
+ procmime_get_encoding_for_text_file(file, &has_binary);
else
ainfo->encoding = ENC_BASE64;
name = g_path_get_basename(filename ? filename : file);
g_free(name);
}
- if (!strcmp(ainfo->content_type, "unknown")) {
+ if (!strcmp(ainfo->content_type, "unknown") || has_binary) {
g_free(ainfo->content_type);
ainfo->content_type = g_strdup("application/octet-stream");
}
prev = cur = iter_;
gtk_text_iter_backward_char(&cur);
if (gtk_text_iter_has_tag(&cur, compose->no_join_tag)) {
+ gtk_text_iter_forward_char(&cur);
+ *iter = cur;
return FALSE;
}
gtk_text_iter_forward_char(&cur);
g_warning("alloc error scanning URIs\n"); \
}
+static gboolean automatic_break = FALSE;
static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
gint startq_offset = -1, noq_offset = -1;
gint uri_start = -1, uri_stop = -1;
gint nouri_start = -1, nouri_stop = -1;
+ gint num_blocks = 0;
+ gint quotelevel = -1;
compose->autowrap = FALSE;
}
/* go until paragraph end (empty line) */
+
while (!gtk_text_iter_ends_line(&iter)) {
gchar *scanpos = NULL;
/* parse table - in order of priority */
{"http://", strcasestr, get_uri_part, make_uri_string},
{"https://", strcasestr, get_uri_part, make_uri_string},
{"ftp://", strcasestr, get_uri_part, make_uri_string},
+ {"sftp://", strcasestr, get_uri_part, make_uri_string},
{"www.", strcasestr, get_uri_part, make_http_string},
{"mailto:", strcasestr, get_uri_part, make_uri_string},
{"@", strcasestr, get_email_part, make_email_string}
gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
gint walk_pos;
+ if (!prev_autowrap && num_blocks == 0) {
+ num_blocks++;
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+ }
if (gtk_text_iter_has_tag(&iter, compose->no_wrap_tag) && !force)
goto colorize;
uri_start = uri_stop = -1;
+ quote_len = 0;
quote_str = compose_get_quote_str(buffer, &iter, "e_len);
if (quote_str) {
debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
if (startq_offset == -1)
startq_offset = gtk_text_iter_get_offset(&iter);
+ quotelevel = get_quote_level(quote_str, prefs_common.quote_chars);
+ if (quotelevel > 2) {
+ /* recycle colors */
+ if (prefs_common.recycle_quote_colors)
+ quotelevel %= 3;
+ else
+ quotelevel = 2;
+ }
} else {
if (startq_offset == -1)
noq_offset = gtk_text_iter_get_offset(&iter);
+ quotelevel = -1;
}
if (prev_autowrap == FALSE && !force && !wrap_quote) {
quote_len)) {
GtkTextIter prev, next, cur;
- if (prev_autowrap != FALSE || force)
+ if (prev_autowrap != FALSE || force) {
+ automatic_break = TRUE;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
- else if (quote_str && wrap_quote)
+ automatic_break = FALSE;
+ } else if (quote_str && wrap_quote) {
+ automatic_break = TRUE;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
- else
+ automatic_break = FALSE;
+ } else
goto colorize;
/* remove trailing spaces */
cur = break_pos;
}
colorize:
+ if (!prev_autowrap && num_blocks > 0) {
+ num_blocks--;
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+ }
end_of_line = iter;
while (!gtk_text_iter_ends_line(&end_of_line)) {
gtk_text_iter_forward_char(&end_of_line);
gtk_text_buffer_get_iter_at_offset(
buffer, &startquote, startq_offset);
endquote = iter;
- gtk_text_buffer_apply_tag_by_name(
- buffer, "quote", &startquote, &endquote);
+ switch (quotelevel) {
+ case 0: gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote0", &startquote, &endquote);
+ break;
+ case 1: gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote1", &startquote, &endquote);
+ break;
+ case 2: gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote2", &startquote, &endquote);
+ break;
+ }
startq_offset = -1;
} else if (noq_offset != -1) {
GtkTextIter startnoquote, endnoquote;
buffer, &startnoquote, noq_offset);
endnoquote = iter;
gtk_text_buffer_remove_tag_by_name(
- buffer, "quote", &startnoquote, &endnoquote);
+ buffer, "quote0", &startnoquote, &endnoquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote1", &startnoquote, &endnoquote);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote2", &startnoquote, &endnoquote);
noq_offset = -1;
}
return ac;
}
+#define QUOTE_IF_REQUIRED(out, str) \
+{ \
+ if (*str != '"' && strpbrk(str, ",.[]<>")) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ if ((__tmp = alloca(len)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ g_string_free(header, TRUE); \
+ return NULL; \
+ } \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ gchar *__tmp; \
+ \
+ if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ g_string_free(header, TRUE); \
+ return NULL; \
+ } else \
+ strcpy(__tmp, str); \
+ \
+ out = __tmp; \
+ } \
+}
+
+#define QUOTE_IF_REQUIRED_NORMAL(out, str, errret) \
+{ \
+ if (*str != '"' && strpbrk(str, ",.[]<>")) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ if ((__tmp = alloca(len)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ errret; \
+ } \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ gchar *__tmp; \
+ \
+ if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ errret; \
+ } else \
+ strcpy(__tmp, str); \
+ \
+ out = __tmp; \
+ } \
+}
+
static void compose_select_account(Compose *compose, PrefsAccount *account,
gboolean init)
{
GtkItemFactory *ifactory;
+ gchar *from = NULL;
g_return_if_fail(account != NULL);
compose->account = account;
+ if (account->name && *account->name) {
+ gchar *buf;
+ QUOTE_IF_REQUIRED_NORMAL(buf, account->name, return);
+ from = g_strdup_printf("%s <%s>",
+ buf, account->address);
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), from);
+ } else {
+ from = g_strdup_printf("<%s>",
+ account->address);
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), from);
+ }
+
+ g_free(from);
+
compose_set_title(compose);
ifactory = gtk_item_factory_from_widget(compose->menubar);
activate_privacy_system(compose, account, FALSE);
- if (!init && compose->mode != COMPOSE_REDIRECT)
+ if (!init && compose->mode != COMPOSE_REDIRECT) {
+ undo_block(compose->undostruct);
compose_insert_sig(compose, TRUE);
+ undo_unblock(compose->undostruct);
+ }
}
gboolean compose_check_for_valid_recipient(Compose *compose) {
}
if (!found_other) {
AlertValue aval;
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
aval = alertpanel(_("Send"),
_("The only recipient is the default CC address. Send anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
return FALSE;
}
}
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
g_strstrip(entry);
- if (strcmp(entry, compose->account->auto_cc)
+ if (strcmp(entry, compose->account->auto_bcc)
|| strcmp(header, (prefs_common.trans_hdr ? gettext("Bcc:") : "Bcc:"))) {
found_other = TRUE;
g_free(entry);
}
if (!found_other) {
AlertValue aval;
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
aval = alertpanel(_("Send"),
_("The only recipient is the default BCC address. Send anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
return FALSE;
}
}
const gchar *str;
if (compose_check_for_valid_recipient(compose) == FALSE) {
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
alertpanel_error(_("Recipient is not specified."));
return FALSE;
}
return FALSE;
}
- str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str == '\0' && check_subject == TRUE) {
- AlertValue aval;
+ if (!compose->batch) {
+ str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ if (*str == '\0' && check_subject == TRUE) {
+ AlertValue aval;
- aval = alertpanel(_("Send"),
- _("Subject is empty. Send it anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
- return FALSE;
+ aval = alertpanel(_("Send"),
+ _("Subject is empty. Send it anyway?"),
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
+ return FALSE;
+ }
}
return TRUE;
gint compose_send(Compose *compose)
{
gint msgnum;
- FolderItem *folder;
+ FolderItem *folder = NULL;
gint val = -1;
- gchar *msgpath;
+ gchar *msgpath = NULL;
+ gboolean discard_window = FALSE;
+ gchar *errstr = NULL;
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+
+ if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
+ || compose->batch == TRUE)
+ discard_window = TRUE;
compose_allow_user_actions (compose, FALSE);
compose->sending = TRUE;
- if (compose_check_entries(compose, TRUE) == FALSE)
+ if (compose_check_entries(compose, TRUE) == FALSE) {
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
goto bail;
+ }
- val = compose_queue(compose, &msgnum, &folder);
+ inc_lock();
+ val = compose_queue(compose, &msgnum, &folder, &msgpath, TRUE);
if (val) {
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
} else if (val == -3) {
+ if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
- "Signature failed."));
- } else if (val == -2) {
+ "Signature failed: %s"), privacy_get_error());
+ } else if (val == -2 && errno != 0) {
alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
} else {
alertpanel_error(_("Could not queue message for sending."));
goto bail;
}
-
- if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
+ if (discard_window) {
compose->sending = FALSE;
compose_close(compose);
/* No more compose access in the normal codepath
alertpanel_error(_("The message was queued but could not be "
"sent.\nUse \"Send queued messages\" from "
"the main window to retry."));
- if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
- compose->sending = FALSE;
- compose->modified = TRUE;
- compose_allow_user_actions (compose, TRUE);
+ if (!discard_window) {
+ goto bail;
}
- return 0;
+ inc_unlock();
+ return -1;
}
-
- msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath);
- g_free(msgpath);
-
- if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ if (msgpath == NULL) {
+ msgpath = folder_item_fetch_msg(folder, msgnum);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
+ g_free(msgpath);
+ } else {
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
+ g_unlink(msgpath);
+ g_free(msgpath);
+ }
+ if (!discard_window) {
compose->sending = FALSE;
compose_allow_user_actions (compose, TRUE);
if (val != 0) {
if (val == 0) {
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
- if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
+ if (!discard_window)
compose_close(compose);
} else {
- alertpanel_error(_("The message was queued but could not be "
+ if (errstr) {
+ gchar *tmp = g_strdup_printf(_("%s\nUse \"Send queued messages\" from "
+ "the main window to retry."), errstr);
+ g_free(errstr);
+ alertpanel_error_log(tmp);
+ g_free(tmp);
+ } else {
+ alertpanel_error_log(_("The message was queued but could not be "
"sent.\nUse \"Send queued messages\" from "
"the main window to retry."));
- if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
- compose_allow_user_actions (compose, TRUE);
- compose->modified = TRUE;
- compose->sending = FALSE;
}
+ if (!discard_window) {
+ goto bail;
+ }
+ inc_unlock();
return -1;
}
-
+ inc_unlock();
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
return 0;
bail:
+ inc_unlock();
compose_allow_user_actions (compose, TRUE);
compose->sending = FALSE;
compose->modified = TRUE;
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
return -1;
}
return -1;
}
-static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
+static gint compose_write_to_file(Compose *compose, FILE *fp, gint action, gboolean attach_parts)
{
GtkTextBuffer *buffer;
GtkTextIter start, end;
MimeInfo *mimemsg, *mimetext;
gint line;
+ if (action == COMPOSE_WRITE_FOR_SEND)
+ attach_parts = TRUE;
+
/* create message MimeInfo */
mimemsg = procmime_mimeinfo_new();
mimemsg->type = MIMETYPE_MESSAGE;
test_conv_global_out = conv_codeset_strdup(chars, src_codeset, out_codeset);
}
- if (!test_conv_global_out && compose->orig_charset) {
+ if (!test_conv_global_out && compose->orig_charset
+ && strcmp(compose->orig_charset, CS_US_ASCII)) {
out_codeset = compose->orig_charset;
debug_print("failure; trying to convert to %s\n", out_codeset);
test_conv_reply = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!test_conv_global_out && !test_conv_reply) {
/* we're lost */
out_codeset = CS_INTERNAL;
- debug_print("finally using %s\n", out_codeset);
+ debug_print("failure; finally using %s\n", out_codeset);
}
g_free(test_conv_global_out);
g_free(test_conv_reply);
msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
"to the specified %s charset.\n"
"Send it as %s?"), out_codeset, src_codeset);
- aval = alertpanel_full(_("Error"), msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
- NULL, ALERT_ERROR, G_ALERTALTERNATE);
+ aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL, _("+_Send"), NULL, FALSE,
+ NULL, ALERT_ERROR, G_ALERTDEFAULT);
g_free(msg);
- if (aval != G_ALERTDEFAULT) {
+ if (aval != G_ALERTALTERNATE) {
g_free(chars);
return -3;
} else {
mimetext->subtype = g_strdup("plain");
g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
g_strdup(out_codeset));
+
/* protect trailing spaces when signing message */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system)) {
encoding = ENC_QUOTED_PRINTABLE;
}
+ debug_print("main text: %d bytes encoded as %s in %d\n",
+ strlen(buf), out_codeset, encoding);
+
/* check for line length limit */
if (action == COMPOSE_WRITE_FOR_SEND &&
encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
"The contents of the message might be broken on the way to the delivery.\n"
"\n"
"Send it anyway?"), line + 1);
- aval = alertpanel(_("Warning"), msg, GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+ aval = alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL);
g_free(msg);
- if (aval != G_ALERTDEFAULT) {
+ if (aval != G_ALERTALTERNATE) {
return -1;
}
}
procmime_encode_content(mimetext, encoding);
/* append attachment parts */
- if (compose_use_attach(compose)) {
+ if (compose_use_attach(compose) && attach_parts) {
MimeInfo *mimempart;
gchar *boundary = NULL;
mimempart = procmime_mimeinfo_new();
mimempart->subtype = g_strdup("mixed");
do {
- if (boundary)
- g_free(boundary);
+ g_free(boundary);
boundary = generate_mime_boundary(NULL);
} while (strstr(buf, boundary) != NULL);
return 0;
}
-static gint compose_remove_reedit_target(Compose *compose)
+static gint compose_remove_reedit_target(Compose *compose, gboolean force)
{
FolderItem *item;
MsgInfo *msginfo = compose->targetinfo;
g_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
if (!msginfo) return -1;
+ if (!force && MSG_IS_LOCKED(msginfo->flags))
+ return 0;
+
item = msginfo->folder;
g_return_val_if_fail(item != NULL, -1);
}
-static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
+gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath,
+ gboolean remove_reedit_target)
{
- return compose_queue_sub (compose, msgnum, item, FALSE);
+ return compose_queue_sub (compose, msgnum, item, msgpath, FALSE, remove_reedit_target);
}
-static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
+ gchar **msgpath, gboolean check_subject,
+ gboolean remove_reedit_target)
{
FolderItem *queue;
gchar *tmp;
if (compose_check_entries(compose, check_subject) == FALSE) {
lock = FALSE;
+ if (compose->batch) {
+ gtk_widget_show_all(compose->window);
+ }
return -1;
}
}
}
- if (prefs_common.linewrap_at_send)
- compose_wrap_all(compose);
-
/* write queue header */
tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
+ lock = FALSE;
return -2;
}
if (newsac)
fprintf(fp, "NAID:%d\n", newsac->account_id);
+
if (compose->privacy_system != NULL) {
fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
if (compose->use_encryption) {
gchar *encdata;
-
- encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
+ if (mailac && mailac->encrypt_to_self) {
+ GSList *tmp_list = g_slist_copy(compose->to_list);
+ tmp_list = g_slist_append(tmp_list, compose->account->address);
+ encdata = privacy_get_encrypt_data(compose->privacy_system, tmp_list);
+ g_slist_free(tmp_list);
+ } else {
+ encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
+ }
if (encdata != NULL) {
if (strcmp(encdata, "_DONT_ENCRYPT_")) {
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
+ lock = FALSE;
+ fclose(fp);
+ g_unlink(tmp);
+ g_free(tmp);
+ return -5;
}
g_free(encdata);
}
gchar *folderid;
folderid = folder_item_get_identifier(compose->replyinfo->folder);
- fprintf(fp, "RMID:%s\x7f%d\x7f%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid);
+ fprintf(fp, "RMID:%s\t%d\t%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid);
g_free(folderid);
}
/* Message-ID of message forwarding to */
gchar *folderid;
folderid = folder_item_get_identifier(compose->fwdinfo->folder);
- fprintf(fp, "FMID:%s\x7f%d\x7f%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
+ fprintf(fp, "FMID:%s\t%d\t%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
g_free(folderid);
}
- fprintf(fp, "\n");
+
+ /* end of headers */
+ fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
if (compose->redirect_filename != NULL) {
if (compose_redirect_write_to_file(compose, fp) < 0) {
}
} else {
gint result = 0;
- if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND)) < 0) {
+ if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND, TRUE)) < 0) {
lock = FALSE;
fclose(fp);
g_unlink(tmp);
FILE_OP_ERROR(tmp, "fclose");
g_unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return -2;
}
- queue = account_get_special_folder(compose->account, F_QUEUE);
+ if (item && *item) {
+ queue = *item;
+ } else {
+ queue = account_get_special_folder(compose->account, F_QUEUE);
+ }
if (!queue) {
g_warning("can't find queue folder\n");
g_unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return -1;
}
folder_item_scan(queue);
- if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
+ if ((num = folder_item_add_msg(queue, tmp, NULL, FALSE)) < 0) {
g_warning("can't queue the message\n");
g_unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return -1;
}
- g_unlink(tmp);
- g_free(tmp);
+
+ if (msgpath == NULL) {
+ g_unlink(tmp);
+ g_free(tmp);
+ } else
+ *msgpath = tmp;
- if (compose->mode == COMPOSE_REEDIT) {
- compose_remove_reedit_target(compose);
+ if (compose->mode == COMPOSE_REEDIT && remove_reedit_target) {
+ compose_remove_reedit_target(compose, FALSE);
}
if ((msgnum != NULL) && (item != NULL)) {
} while (gtk_tree_model_iter_next(model, &iter));
}
-#define QUOTE_IF_REQUIRED(out, str) \
-{ \
- if (*str != '"' && strpbrk(str, ",.[]<>")) { \
- gchar *__tmp; \
- gint len; \
- \
- len = strlen(str) + 3; \
- if ((__tmp = alloca(len)) == NULL) { \
- g_warning("can't allocate memory\n"); \
- g_string_free(header, TRUE); \
- return NULL; \
- } \
- g_snprintf(__tmp, len, "\"%s\"", str); \
- out = __tmp; \
- } else { \
- gchar *__tmp; \
- \
- if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
- g_warning("can't allocate memory\n"); \
- g_string_free(header, TRUE); \
- return NULL; \
- } else \
- strcpy(__tmp, str); \
- \
- out = __tmp; \
- } \
-}
-
#define IS_IN_CUSTOM_HEADER(header) \
(compose->account->add_customhdr && \
custom_header_find(compose->account->customhdr_list, header) != NULL)
GSList *list;
gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GString *header;
+ gchar *from_name = NULL, *from_address = NULL;
+ gchar *tmp;
g_return_val_if_fail(compose->account != NULL, NULL);
g_return_val_if_fail(compose->account->address != NULL, NULL);
header = g_string_sized_new(64);
/* Date */
- if (compose->account->add_date) {
- get_rfc822_date(buf, sizeof(buf));
- g_string_append_printf(header, "Date: %s\n", buf);
- }
+ get_rfc822_date(buf, sizeof(buf));
+ g_string_append_printf(header, "Date: %s\n", buf);
/* From */
+
if (compose->account->name && *compose->account->name) {
+ gchar *buf;
+ QUOTE_IF_REQUIRED(buf, compose->account->name);
+ tmp = g_strdup_printf("%s <%s>",
+ buf, compose->account->address);
+ } else {
+ tmp = g_strdup_printf("%s",
+ compose->account->address);
+ }
+ if (!strcmp(gtk_entry_get_text(GTK_ENTRY(compose->from_name)), tmp)
+ || strlen(gtk_entry_get_text(GTK_ENTRY(compose->from_name))) == 0) {
+ /* use default */
+ from_name = compose->account->name ? g_strdup(compose->account->name):NULL;
+ from_address = g_strdup(compose->account->address);
+ } else {
+ gchar *spec = gtk_editable_get_chars(GTK_EDITABLE(compose->from_name), 0, -1);
+ /* extract name and address */
+ if (strstr(spec, " <") && strstr(spec, ">")) {
+ from_address = g_strdup(strrchr(spec, '<')+1);
+ *(strrchr(from_address, '>')) = '\0';
+ from_name = g_strdup(spec);
+ *(strrchr(from_name, '<')) = '\0';
+ } else {
+ from_name = NULL;
+ from_address = g_strdup(spec);
+ }
+ g_free(spec);
+ }
+ g_free(tmp);
+
+
+ if (from_name && *from_name) {
compose_convert_header
- (compose, buf, sizeof(buf), compose->account->name,
+ (compose, buf, sizeof(buf), from_name,
strlen("From: "), TRUE);
QUOTE_IF_REQUIRED(name, buf);
+
g_string_append_printf(header, "From: %s <%s>\n",
- name, compose->account->address);
+ name, from_address);
} else
- g_string_append_printf(header, "From: %s\n", compose->account->address);
+ g_string_append_printf(header, "From: %s\n", from_address);
+ g_free(from_name);
+ g_free(from_address);
+
/* To */
compose_add_headerfield_from_headerlist(compose, header, "To", ", ");
test_conv_global_out = conv_codeset_strdup(src, CS_INTERNAL, out_codeset);
}
- if (!test_conv_global_out && compose->orig_charset) {
+ if (!test_conv_global_out && compose->orig_charset
+ && strcmp(compose->orig_charset, CS_US_ASCII)) {
out_codeset = compose->orig_charset;
debug_print("failure; trying to convert to %s\n", out_codeset);
test_conv_reply = conv_codeset_strdup(src, CS_INTERNAL, out_codeset);
/* Entry field */
entry = gtk_entry_new();
gtk_widget_show(entry);
+ gtk_tooltips_set_tip(compose->tooltips, entry,
+ _("Use <tab> to autocomplete from addressbook"), NULL);
gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
g_signal_connect(G_OBJECT(entry), "key-press-event",
static GtkWidget *compose_create_header(Compose *compose)
{
- GtkWidget *label;
- GtkWidget *hbox;
GtkWidget *from_optmenu_hbox;
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
header_table = gtk_table_new(2, 2, FALSE);
gtk_widget_show(header_table);
- gtk_container_set_border_width(GTK_CONTAINER(header_table), 2);
+ gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN);
count = 0;
/* option menu for selecting accounts */
- hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(prefs_common.trans_hdr ? _("From:") : "From:");
- gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_table_attach(GTK_TABLE(header_table), hbox, 0, 1, count, count + 1,
- GTK_FILL, 0, 2, 0);
from_optmenu_hbox = compose_account_option_menu_create(compose);
gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
- 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
count++;
compose->header_table = header_table;
gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist),
- prefs_common.enable_rules_hint);
+ prefs_common.use_stripes_everywhere);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
/* Table for settings */
table = gtk_table_new(3, 1, FALSE);
+ gtk_container_set_border_width(GTK_CONTAINER(table), BORDER_WIDTH);
gtk_widget_show(table);
gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
rowcount = 0;
}
static void entry_paste_clipboard(Compose *compose, GtkWidget *entry, gboolean wrap,
- GdkAtom clip);
+ GdkAtom clip, GtkTextIter *insert_place);
#define BLOCK_WRAP() { \
prev_autowrap = compose->autowrap; \
#if USE_ASPELL
if (event->button == 3) {
GtkTextIter iter;
+ GtkTextIter sel_start, sel_end;
+ gboolean stuff_selected;
gint x, y;
/* move the cursor to allow GtkAspell to check the word
* under the mouse */
&x, &y);
gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
&iter, x, y);
+ /* get selection */
+ stuff_selected = gtk_text_buffer_get_selection_bounds(
+ GTK_TEXT_VIEW(text)->buffer,
+ &sel_start, &sel_end);
+
gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->buffer, &iter);
+ /* reselect stuff */
+ if (stuff_selected
+ && gtk_text_iter_in_range(&iter, &sel_start, &sel_end)) {
+ gtk_text_buffer_select_range(GTK_TEXT_VIEW(text)->buffer,
+ &sel_start, &sel_end);
+ }
return FALSE; /* pass the event so that the right-click goes through */
}
#endif
if (event->button == 2) {
+ GtkTextIter iter;
+ gint x, y;
BLOCK_WRAP();
- entry_paste_clipboard(compose, compose->focused_editable,
+
+ /* get the middle-click position to paste at the correct place */
+ gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
+ GTK_TEXT_WINDOW_TEXT, event->x, event->y,
+ &x, &y);
+ gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
+ &iter, x, y);
+
+ entry_paste_clipboard(compose, text,
prefs_common.linewrap_pastes,
- GDK_SELECTION_PRIMARY);
+ GDK_SELECTION_PRIMARY, &iter);
UNBLOCK_WRAP();
return TRUE;
}
return FALSE;
}
-static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
+#if USE_ASPELL
+static void compose_spell_menu_changed(void *data)
+{
+ Compose *compose = (Compose *)data;
+ GSList *items;
+ GtkWidget *menuitem;
+ GtkWidget *parent_item;
+ GtkMenu *menu = GTK_MENU(gtk_menu_new());
+ GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
+ GSList *spell_menu;
+
+ if (compose->gtkaspell == NULL)
+ return;
+
+ parent_item = gtk_item_factory_get_item(ifactory,
+ "/Spelling/Options");
+
+ /* setting the submenu removes /Spelling/Options from the factory
+ * so we need to save it */
+
+ if (parent_item == NULL) {
+ parent_item = compose->aspell_options_menu;
+ gtk_menu_item_remove_submenu(GTK_MENU_ITEM(parent_item));
+ } else
+ compose->aspell_options_menu = parent_item;
+
+ spell_menu = gtkaspell_make_config_menu(compose->gtkaspell);
+
+ spell_menu = g_slist_reverse(spell_menu);
+ for (items = spell_menu;
+ items; items = items->next) {
+ menuitem = GTK_WIDGET(GTK_MENU_ITEM(items->data));
+ gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), GTK_WIDGET(menuitem));
+ gtk_widget_show(GTK_WIDGET(menuitem));
+ }
+ g_slist_free(spell_menu);
+
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(parent_item), GTK_WIDGET(menu));
+
+}
+#endif
+
+static gboolean compose_force_window_origin = TRUE;
+static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
+ gboolean batch)
{
Compose *compose;
GtkWidget *window;
gchar *titles[N_ATTACH_COLS];
guint n_menu_entries;
- GdkColormap *cmap;
- GdkColor color[1];
- gboolean success[1];
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
GtkItemFactory *ifactory;
titles[COL_SIZE] = _("Size");
titles[COL_NAME] = _("Name");
+ compose->batch = batch;
compose->account = account;
compose->mutex = g_mutex_new();
compose->set_cursor_pos = -1;
+ compose->tooltips = gtk_tooltips_new();
+
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MIN_SIZE);
- gtk_widget_set_uposition(window, prefs_common.compose_x,
+
+ if (compose_force_window_origin)
+ gtk_widget_set_uposition(window, prefs_common.compose_x,
prefs_common.compose_y);
g_signal_connect(G_OBJECT(window), "delete_event",
gtk_widget_show(notebook);
/* header labels and entries */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_header(compose), gtk_label_new(_("Header")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ compose_create_header(compose),
+ gtk_label_new_with_mnemonic(_("Hea_der")));
/* attachment list */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_attach(compose), gtk_label_new(_("Attachments")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ compose_create_attach(compose),
+ gtk_label_new_with_mnemonic(_("_Attachments")));
/* Others Tab */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ compose_create_others(compose),
+ gtk_label_new_with_mnemonic(_("Othe_rs")));
/* Subject */
subject_hbox = gtk_hbox_new(FALSE, 0);
G_CALLBACK(text_inserted), compose);
g_signal_connect(G_OBJECT(text), "button_press_event",
G_CALLBACK(text_clicked), compose);
+ g_signal_connect(G_OBJECT(subject_entry), "changed",
+ G_CALLBACK(compose_changed_cb), compose);
/* drag and drop */
gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types,
}
}
- color[0] = quote_color;
- cmap = gdk_drawable_get_colormap(window->window);
- gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success);
- if (success[0] == FALSE) {
- GtkStyle *style;
-
- g_warning("Compose: color allocation failed.\n");
- style = gtk_widget_get_style(text);
- quote_color = style->black;
- }
-
n_entries = sizeof(compose_popup_entries) /
sizeof(compose_popup_entries[0]);
popupmenu = menu_create_items(compose_popup_entries, n_entries,
menu_set_sensitive(ifactory, "/Spelling", FALSE);
if (mode != COMPOSE_REDIRECT) {
if (prefs_common.enable_aspell && prefs_common.dictionary &&
- strcmp(prefs_common.dictionary, _("None"))) {
+ strcmp(prefs_common.dictionary, "")) {
gtkaspell = gtkaspell_new(prefs_common.aspell_path,
prefs_common.dictionary,
conv_get_locale_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
+ prefs_common.recheck_when_changing_dict,
prefs_common.use_alternate,
GTK_TEXT_VIEW(text),
- GTK_WINDOW(compose->window));
+ GTK_WINDOW(compose->window),
+ compose_spell_menu_changed,
+ compose);
if (!gtkaspell) {
alertpanel_error(_("Spell checker could not "
"be started.\n%s"),
}
}
compose->gtkaspell = gtkaspell;
+ compose_spell_menu_changed(compose);
#endif
compose_select_account(compose, account, TRUE);
activate_privacy_system(compose, account, TRUE);
toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
- gtk_widget_show(window);
+ if (batch) {
+ gtk_widget_realize(window);
+ } else {
+ gtk_widget_show(window);
+ }
return compose;
}
GList *accounts;
GtkWidget *hbox;
GtkWidget *optmenu;
- GtkWidget *menu;
- gint num = 0, def_menu = 0;
+ GtkWidget *optmenubox;
+ GtkListStore *menu;
+ GtkTreeIter iter;
+ GtkWidget *from_name = NULL;
+ gint num = 0, def_menu = 0;
+
accounts = account_get_list();
g_return_val_if_fail(accounts != NULL, NULL);
- hbox = gtk_hbox_new(FALSE, 0);
- optmenu = gtk_option_menu_new();
- gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
- menu = gtk_menu_new();
+ optmenubox = gtk_event_box_new();
+ optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
+ menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
+
+ hbox = gtk_hbox_new(FALSE, 6);
+ from_name = gtk_entry_new();
+
+ g_signal_connect_after(G_OBJECT(from_name), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
for (; accounts != NULL; accounts = accounts->next, num++) {
PrefsAccount *ac = (PrefsAccount *)accounts->data;
- GtkWidget *menuitem;
- gchar *name;
+ gchar *name, *from = NULL;
if (ac == compose->account) def_menu = num;
- if (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->account_id);
+ name = g_markup_printf_escaped(_("From: <i>%s</i>"),
+ ac->account_name);
+
+ if (ac == compose->account) {
+ if (ac->name && *ac->name) {
+ gchar *buf;
+ QUOTE_IF_REQUIRED_NORMAL(buf, ac->name, return NULL);
+ from = g_strdup_printf("%s <%s>",
+ buf, ac->address);
+ gtk_entry_set_text(GTK_ENTRY(from_name), from);
+ } else {
+ from = g_strdup_printf("%s",
+ ac->address);
+ gtk_entry_set_text(GTK_ENTRY(from_name), from);
+ }
+ }
+ COMBOBOX_ADD(menu, name, ac->account_id);
g_free(name);
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(account_activated),
- compose);
+ g_free(from);
}
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
- gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), def_menu);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), def_menu);
+
+ g_signal_connect(G_OBJECT(optmenu), "changed",
+ G_CALLBACK(account_activated),
+ compose);
+
+ gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
+
+ gtk_tooltips_set_tip(compose->tooltips, optmenubox,
+ _("Account to use for this email"), NULL);
+ gtk_tooltips_set_tip(compose->tooltips, from_name,
+ _("Sender address to be used"), NULL);
+ compose->from_name = from_name;
+
return hbox;
}
GtkTextMark *mark;
GtkTextIter iter;
gchar *qmark;
- gchar *parsed_str;
+ gchar *parsed_str = NULL;
gint cursor_pos = 0;
- if (!tmpl || !tmpl->value) return;
+ if (!tmpl) return;
+
+ /* process the body */
text = GTK_TEXT_VIEW(compose->text);
buffer = gtk_text_view_get_buffer(text);
- if (tmpl->subject && *tmpl->subject != '\0')
- gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
- 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);
-
- if (tmpl->bcc && *tmpl->bcc != '\0')
- compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
-
if (replace)
gtk_text_buffer_set_text(buffer, "", -1);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
- if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
- parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
- NULL, NULL, FALSE);
- } else {
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
-
- if (compose->replyinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->replyinfo,
- tmpl->value, qmark, NULL, FALSE);
- else if (compose->fwdinfo != NULL)
- parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
- tmpl->value, qmark, NULL, FALSE);
- else
- parsed_str = NULL;
+ if (tmpl->value) {
+ if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
+ parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
+ NULL, NULL, FALSE);
+ } else {
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
+
+ if (compose->replyinfo != NULL)
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark, NULL, FALSE);
+ else if (compose->fwdinfo != NULL)
+ parsed_str = compose_quote_fmt(compose, compose->fwdinfo,
+ tmpl->value, qmark, NULL, FALSE);
+ else
+ parsed_str = NULL;
+ }
}
-
if (replace && parsed_str && compose->account->auto_sig)
compose_insert_sig(compose, FALSE);
gtk_text_buffer_place_cursor(buffer, &iter);
}
- if (parsed_str)
- compose_changed_cb(NULL, compose);
+ /* process the other fields */
+ compose_template_apply_fields(compose, tmpl);
+ quote_fmt_reset_vartable();
+ compose_changed_cb(NULL, compose);
+}
+
+void compose_template_apply_fields(Compose *compose, Template *tmpl)
+{
+ static MsgInfo dummyinfo;
+ MsgInfo *msginfo = NULL;
+ gchar *buf = NULL;
+
+ if (compose->replyinfo != NULL)
+ msginfo = compose->replyinfo;
+ else if (compose->fwdinfo != NULL)
+ msginfo = compose->fwdinfo;
+ else
+ msginfo = &dummyinfo;
+
+ if (tmpl->to && *tmpl->to != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->to);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message To format error."));
+ } else {
+ compose_entry_append(compose, buf, COMPOSE_TO);
+ }
+ }
+
+ if (tmpl->cc && *tmpl->cc != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->cc);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message Cc format error."));
+ } else {
+ compose_entry_append(compose, buf, COMPOSE_CC);
+ }
+ }
+
+ if (tmpl->bcc && *tmpl->bcc != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->bcc);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message Bcc format error."));
+ } else {
+ compose_entry_append(compose, buf, COMPOSE_BCC);
+ }
+ }
+
+ /* process the subject */
+ if (tmpl->subject && *tmpl->subject != '\0') {
+ quote_fmt_init(msginfo, NULL, NULL, FALSE);
+ quote_fmt_scan_string(tmpl->subject);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message subject format error."));
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
+ }
+ }
}
static void compose_destroy(Compose *compose)
{
compose_list = g_list_remove(compose_list, compose);
+ if (compose->updating) {
+ debug_print("danger, not destroying anything now\n");
+ compose->deferred_destroy = TRUE;
+ return;
+ }
/* NOTE: address_completion_end() does nothing with the window
* however this may change. */
address_completion_end(compose->window);
g_free(compose->msgid);
g_free(compose->boundary);
- if (compose->redirect_filename)
- g_free(compose->redirect_filename);
+ g_free(compose->redirect_filename);
if (compose->undostruct)
undo_destroy(compose->undostruct);
{
GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- GtkOptionMenu *optmenu;
+ GtkComboBox *optmenu;
GtkTreeSelection *selection;
GList *sel;
GtkTreeModel *model;
gtk_widget_show(attach_prop.window);
manage_window_set_transient(GTK_WINDOW(attach_prop.window));
- optmenu = GTK_OPTION_MENU(attach_prop.encoding_optmenu);
+ optmenu = GTK_COMBO_BOX(attach_prop.encoding_optmenu);
if (ainfo->encoding == ENC_UNKNOWN)
- menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
- GINT_TO_POINTER(ENC_BASE64));
+ combobox_select_by_data(optmenu, ENC_BASE64);
else
- menu_select_by_data(GTK_MENU(gtk_option_menu_get_menu(optmenu)),
- GINT_TO_POINTER(ainfo->encoding));
+ combobox_select_by_data(optmenu, ainfo->encoding);
gtk_entry_set_text(GTK_ENTRY(attach_prop.mimetype_entry),
ainfo->content_type ? ainfo->content_type : "");
gchar *cnttype = NULL;
gchar *file = NULL;
off_t size = 0;
- GtkWidget *menu;
- GtkWidget *menuitem;
cancelled = FALSE;
gtk_main();
}
}
- menu = gtk_option_menu_get_menu(optmenu);
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- ainfo->encoding = GPOINTER_TO_INT
- (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+ ainfo->encoding = combobox_get_active_data(optmenu);
entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
if (*entry_text != '\0') {
GtkWidget *mimetype_entry;
GtkWidget *hbox;
GtkWidget *optmenu;
- GtkWidget *optmenu_menu;
- GtkWidget *menuitem;
+ GtkListStore *optmenu_menu;
GtkWidget *path_entry;
GtkWidget *filename_entry;
GtkWidget *hbbox;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
GList *mime_type_list, *strlist;
+ GtkTreeIter iter;
debug_print("Creating attach_property window...\n");
gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 1, 2,
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- optmenu = gtk_option_menu_new();
- gtk_box_pack_start(GTK_BOX(hbox), optmenu, TRUE, TRUE, 0);
-
- optmenu_menu = gtk_menu_new();
- MENUITEM_ADD(optmenu_menu, menuitem, "7bit", ENC_7BIT);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
- MENUITEM_ADD(optmenu_menu, menuitem, "8bit", ENC_8BIT);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
- MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable",
- ENC_QUOTED_PRINTABLE);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+ optmenu = gtkut_sc_combobox_create(NULL, TRUE);
+ optmenu_menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
- MENUITEM_ADD(optmenu_menu, menuitem, "base64", ENC_BASE64);
+ COMBOBOX_ADD(optmenu_menu, "7bit", ENC_7BIT);
+ COMBOBOX_ADD(optmenu_menu, "8bit", ENC_8BIT);
+ COMBOBOX_ADD(optmenu_menu, "quoted-printable", ENC_QUOTED_PRINTABLE);
+ COMBOBOX_ADD(optmenu_menu, "base64", ENC_BASE64);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(optmenu), 0);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
+ gtk_box_pack_start(GTK_BOX(hbox), optmenu, TRUE, TRUE, 0);
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
- gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
- &cancel_btn, GTK_STOCK_CANCEL,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
#ifdef G_OS_UNIX
static gint compose_exec_ext_editor_real(const gchar *file)
{
- static gchar *def_cmd = "emacs %s";
gchar buf[1024];
gchar *p;
gchar **cmdline;
if (prefs_common.ext_editor_cmd)
g_warning("External editor command line is invalid: '%s'\n",
prefs_common.ext_editor_cmd);
- g_snprintf(buf, sizeof(buf), def_cmd, file);
+ g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, file);
}
cmdline = strsplit_with_quote(buf, " ", 1024);
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
- val = alertpanel_full(_("Notice"), msg, GTK_STOCK_YES, GTK_STOCK_NO,
- NULL, FALSE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
+ val = alertpanel_full(_("Notice"), msg, GTK_STOCK_NO, GTK_STOCK_YES,
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(msg);
- if (val == G_ALERTDEFAULT) {
+ if (val == G_ALERTALTERNATE) {
g_source_remove(compose->exteditor_tag);
g_io_channel_shutdown(compose->exteditor_ch,
FALSE, NULL);
menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
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_current_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
+ gtk_widget_set_sensitive(compose->text, sensitive);
+ 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->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_current_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+ if (compose->toolbar->linewrap_all_btn)
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
}
#endif /* G_OS_UNIX */
return TRUE;
}
-static void account_activated(GtkMenuItem *menuitem, gpointer data)
+static void account_activated(GtkComboBox *optmenu, gpointer data)
{
Compose *compose = (Compose *)data;
PrefsAccount *ac;
gchar *folderidentifier;
+ gint account_id = 0;
+ GtkTreeModel *menu;
+ GtkTreeIter iter;
- ac = account_find_from_id(
- GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
+ /* Get ID of active account in the combo box */
+ menu = gtk_combo_box_get_model(optmenu);
+ gtk_combo_box_get_active_iter(optmenu, &iter);
+ gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
+
+ ac = account_find_from_id(account_id);
g_return_if_fail(ac != NULL);
if (ac != compose->account)
{
Compose *compose = (Compose *)data;
- if (prefs_common.work_offline && !inc_offline_should_override())
+ if (prefs_common.work_offline &&
+ !inc_offline_should_override(
+ _("Sylpheed-Claws needs network access in order "
+ "to send this email.")))
return;
if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue_sub(compose, NULL, NULL, TRUE);
- if (!val)
+ inc_lock();
+ val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
+ inc_unlock();
+
+ if (!val) {
compose_close(compose);
- else if (val == -2) {
+ } else if (val == -1) {
+ alertpanel_error(_("Could not queue message."));
+ } else if (val == -2) {
alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
+ } else if (val == -3) {
+ if (privacy_peek_error())
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Signature failed: %s"), privacy_get_error());
+ } else if (val == -4) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
}
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
}
void compose_draft (gpointer data)
static gboolean lock = FALSE;
MsgInfo *newmsginfo;
FILE *fp;
+ gboolean target_locked = FALSE;
if (lock) return;
/* Save draft infos */
fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
fprintf(fp, "S:%s\n", compose->account->address);
+
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
}
- fprintf(fp, "\n");
- if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
+ /* Message-ID of message replying to */
+ if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
+ gchar *folderid;
+
+ folderid = folder_item_get_identifier(compose->replyinfo->folder);
+ fprintf(fp, "RMID:%s\t%d\t%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid);
+ g_free(folderid);
+ }
+ /* Message-ID of message forwarding to */
+ if ((compose->fwdinfo != NULL) && (compose->fwdinfo->msgid != NULL)) {
+ gchar *folderid;
+
+ folderid = folder_item_get_identifier(compose->fwdinfo->folder);
+ fprintf(fp, "FMID:%s\t%d\t%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
+ g_free(folderid);
+ }
+
+ /* end of headers */
+ fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
+
+ if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE, action != COMPOSE_AUTO_SAVE) < 0) {
fclose(fp);
g_unlink(tmp);
g_free(tmp);
goto unlock;
}
fclose(fp);
+
+ if (compose->targetinfo) {
+ target_locked = MSG_IS_LOCKED(compose->targetinfo->flags);
+ flag.perm_flags = target_locked?MSG_LOCKED:0;
+ }
+ flag.tmp_flags = MSG_DRAFT;
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
goto unlock;
}
g_free(tmp);
- draft->mtime = 0; /* force updating */
if (compose->mode == COMPOSE_REEDIT) {
- compose_remove_reedit_target(compose);
+ compose_remove_reedit_target(compose, TRUE);
}
newmsginfo = folder_item_get_msginfo(draft, msgnum);
if (newmsginfo) {
procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
- procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
- if (compose_use_attach(compose))
+ if (target_locked)
+ procmsg_msginfo_set_flags(newmsginfo, MSG_LOCKED, MSG_DRAFT);
+ else
+ procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+ if (compose_use_attach(compose) && action != COMPOSE_AUTO_SAVE)
procmsg_msginfo_set_flags(newmsginfo, 0,
MSG_HAS_ATTACHMENT);
gchar *path;
path = folder_item_fetch_msg(draft, msgnum);
- g_return_if_fail(path != NULL);
+ if (path == NULL) {
+ debug_print("can't fetch %s:%d\n",draft->path, msgnum);
+ goto unlock;
+ }
if (g_stat(path, &s) < 0) {
FILE_OP_ERROR(path, "stat");
g_free(path);
compose->targetinfo->size = s.st_size;
compose->targetinfo->mtime = s.st_mtime;
compose->targetinfo->folder = draft;
+ if (target_locked)
+ procmsg_msginfo_set_flags(compose->targetinfo, MSG_LOCKED, 0);
compose->mode = COMPOSE_REEDIT;
if (action == COMPOSE_AUTO_SAVE) {
prefs_common.compose_x = x;
prefs_common.compose_y = y;
- if (compose->sending)
+ if (compose->sending || compose->updating)
return TRUE;
compose_close_cb(compose, 0, NULL);
return TRUE;
}
static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
- gboolean wrap, GdkAtom clip)
+ gboolean wrap, GdkAtom clip, GtkTextIter *insert_place)
{
if (GTK_IS_TEXT_VIEW(entry)) {
GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
GtkTextIter start_iter, end_iter;
gint start, end;
-
gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(clip));
if (contents == NULL)
return;
- gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
- gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
-
- start = gtk_text_iter_get_offset(&start_iter);
+ undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
- gtk_text_buffer_insert(buffer, &start_iter, contents, strlen(contents));
+ /* we shouldn't delete the selection when middle-click-pasting, or we
+ * can't mid-click-paste our own selection */
+ if (clip != GDK_SELECTION_PRIMARY) {
+ gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
+ }
+
+ if (insert_place == NULL) {
+ /* if insert_place isn't specified, insert at the cursor.
+ * used for Ctrl-V pasting */
+ gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
+ start = gtk_text_iter_get_offset(&start_iter);
+ gtk_text_buffer_insert(buffer, &start_iter, contents, strlen(contents));
+ } else {
+ /* if insert_place is specified, paste here.
+ * used for mid-click-pasting */
+ start = gtk_text_iter_get_offset(insert_place);
+ gtk_text_buffer_insert(buffer, insert_place, contents, strlen(contents));
+ }
if (!wrap) {
+ /* paste unwrapped: mark the paste so it's not wrapped later */
end = start + strlen(contents);
gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, start);
gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, end);
gtk_text_buffer_apply_tag_by_name(buffer, "no_wrap", &start_iter, &end_iter);
} else if (wrap && clip == GDK_SELECTION_PRIMARY) {
+ /* rewrap paragraph now (after a mid-click-paste) */
mark_start = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
gtk_text_iter_backward_char(&start_iter);
compose_beautify_paragraph(compose, &start_iter, TRUE);
}
-
} else if (GTK_IS_EDITABLE(entry))
gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable,
prefs_common.linewrap_pastes,
- GDK_SELECTION_CLIPBOARD);
+ GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
}
prefs_common.linewrap_quote = prefs_common.linewrap_pastes;
entry_paste_clipboard(compose, compose->focused_editable,
prefs_common.linewrap_pastes,
- GDK_SELECTION_CLIPBOARD);
+ GDK_SELECTION_CLIPBOARD, NULL);
prefs_common.linewrap_quote = wrap_quote;
}
}
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable, FALSE,
- GDK_SELECTION_CLIPBOARD);
+ GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
}
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
entry_paste_clipboard(compose, compose->focused_editable, TRUE,
- GDK_SELECTION_CLIPBOARD);
+ GDK_SELECTION_CLIPBOARD, NULL);
UNBLOCK_WRAP();
}
compose_beautify_paragraph(compose, NULL, TRUE);
}
+static void compose_find_cb(gpointer data, guint action, GtkWidget *widget)
+{
+ Compose *compose = (Compose *)data;
+
+ message_search_compose(compose);
+}
+
static void compose_toggle_autowrap_cb(gpointer data, guint action,
GtkWidget *widget)
{
compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
if (compose->autowrap)
compose_wrap_all_full(compose, TRUE);
+ compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
}
static void compose_toggle_sign_cb(gpointer data, guint action,
}
static void compose_attach_drag_received_cb (GtkWidget *widget,
- GdkDragContext *drag_context,
+ GdkDragContext *context,
gint x,
gint y,
GtkSelectionData *data,
GList *list, *tmp;
if (gdk_atom_name(data->type) &&
- !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ !strcmp(gdk_atom_name(data->type), "text/uri-list")
+ && gtk_drag_get_source_widget(context) !=
+ mainwindow_get_mainwindow()->summaryview->ctree) {
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next)
compose_attach_append
if (list) compose_changed_cb(NULL, compose);
list_free_strings(list);
g_list_free(list);
- } else if (gdk_atom_name(data->type) &&
- !strcmp(gdk_atom_name(data->type), "text/plain") &&
- data->data && !strcmp(data->data, "Dummy-Summaryview")) {
+ } else if (gtk_drag_get_source_widget(context)
+ == mainwindow_get_mainwindow()->summaryview->ctree) {
/* comes from our summaryview */
SummaryView * summaryview = NULL;
GSList * list = NULL, *cur = NULL;
/* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
* does not work */
if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ AlertValue val = G_ALERTDEFAULT;
+
+ switch (prefs_common.compose_dnd_mode) {
+ case COMPOSE_DND_ASK:
+ val = alertpanel_full(_("Insert or attach?"),
+ _("Do you want to insert the contents of the file(s) "
+ "into the message body, or attach it to the email?"),
+ GTK_STOCK_CANCEL, _("+_Insert"), _("_Attach"),
+ TRUE, NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+ break;
+ case COMPOSE_DND_INSERT:
+ val = G_ALERTALTERNATE;
+ break;
+ case COMPOSE_DND_ATTACH:
+ val = G_ALERTOTHER;
+ break;
+ default:
+ /* unexpected case */
+ g_warning("error: unexpected compose_dnd_mode option value in compose_insert_drag_received_cb()");
+ }
+
+ if (val & G_ALERTDISABLE) {
+ val &= ~G_ALERTDISABLE;
+ /* remember what action to perform by default, only if we don't click Cancel */
+ if (val == G_ALERTALTERNATE)
+ prefs_common.compose_dnd_mode = COMPOSE_DND_INSERT;
+ else if (val == G_ALERTOTHER)
+ prefs_common.compose_dnd_mode = COMPOSE_DND_ATTACH;
+ }
+
+ if (val == G_ALERTDEFAULT || val == G_ALERTCANCEL) {
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ return;
+ } else if (val == G_ALERTOTHER) {
+ compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
+ return;
+ }
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next) {
compose_insert_file(compose, (const gchar *)tmp->data);
gtk_text_buffer_place_cursor(buffer, iter);
compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE);
+ quote_fmt_reset_vartable();
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation - 1));
gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
gtk_text_buffer_place_cursor(buffer, iter);
} else {
- if (strcmp(text, "\n"))
+ if (strcmp(text, "\n") || automatic_break
+ || gtk_text_iter_starts_line(iter))
gtk_text_buffer_insert(buffer, iter, text, len);
- else
+ else {
+ debug_print("insert nowrap \\n\n");
gtk_text_buffer_insert_with_tags_by_name(buffer,
iter, text, len, "no_join", NULL);
+ }
}
mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
return account;
}
-static gboolean compose_close(Compose *compose)
+gboolean compose_close(Compose *compose)
{
gint x, y;
}
}
-void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
- guint action)
+static void compose_reply_from_messageview_real(MessageView *msgview, GSList *msginfo_list,
+ guint action, gboolean opening_multiple)
{
- gchar *body;
+ gchar *body = NULL;
GSList *new_msglist = NULL;
MsgInfo *tmp_msginfo = NULL;
gboolean originally_enc = FALSE;
g_return_if_fail(msginfo_list != NULL);
- if (g_slist_length(msginfo_list) == 1) {
+ if (g_slist_length(msginfo_list) == 1 && !opening_multiple) {
MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
MsgInfo *orig_msginfo = (MsgInfo *)msginfo_list->data;
}
}
- body = messageview_get_selection(msgview);
+ if (!opening_multiple)
+ body = messageview_get_selection(msgview);
if (new_msglist) {
compose = compose_reply_mode((ComposeMode)action, new_msglist, body);
g_free(body);
}
+void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
+ guint action)
+{
+ if ((!prefs_common.forward_as_attachment || action != COMPOSE_FORWARD)
+ && action != COMPOSE_FORWARD_AS_ATTACH && g_slist_length(msginfo_list) > 1) {
+ GSList *cur = msginfo_list;
+ gchar *msg = g_strdup_printf(_("You are about to reply to %d "
+ "messages. Opening the windows "
+ "could take some time. Do you "
+ "want to continue?"),
+ g_slist_length(msginfo_list));
+ if (g_slist_length(msginfo_list) > 9
+ && alertpanel(_("Warning"), msg, GTK_STOCK_CANCEL, "+" GTK_STOCK_YES, NULL)
+ != G_ALERTALTERNATE) {
+ g_free(msg);
+ return;
+ }
+ g_free(msg);
+ /* We'll open multiple compose windows */
+ /* let the WM place the next windows */
+ compose_force_window_origin = FALSE;
+ for (; cur; cur = cur->next) {
+ GSList tmplist;
+ tmplist.data = cur->data;
+ tmplist.next = NULL;
+ compose_reply_from_messageview_real(msgview, &tmplist, action, TRUE);
+ }
+ compose_force_window_origin = TRUE;
+ } else {
+ /* forwarding multiple mails as attachments is done via a
+ * single compose window */
+ compose_reply_from_messageview_real(msgview, msginfo_list, action, FALSE);
+ }
+}
+
+void compose_set_position(Compose *compose, gint pos)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+ gtkut_text_view_set_position(text, pos);
+}
+
+gboolean compose_search_string(Compose *compose,
+ const gchar *str, gboolean case_sens)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+ return gtkut_text_view_search_string(text, str, case_sens);
+}
+
+gboolean compose_search_string_backward(Compose *compose,
+ const gchar *str, gboolean case_sens)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+ return gtkut_text_view_search_string_backward(text, str, case_sens);
+}
+
/*
* End of Source.
*/
projects / claws.git / blobdiff