/*
* 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"
+
enum
{
COL_MIMETYPE = 0,
gint action);
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);
+ FolderItem **item,
+ gchar **msgpath);
static gint compose_queue_sub (Compose *compose,
gint *msgnum,
FolderItem **item,
+ gchar **msgpath,
gboolean check_subject);
static void compose_add_attachments (Compose *compose,
MimeInfo *parent);
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);
{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"),
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>"},
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->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);
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 *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;
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 */
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) {
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);
AlertValue aval;
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;
}
}
AlertValue aval;
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;
}
}
aval = alertpanel(_("Send"),
_("Subject is empty. Send it anyway?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT)
+ GTK_STOCK_CANCEL, _("+_Send"), NULL);
+ if (aval != G_ALERTALTERNATE)
return FALSE;
}
gint msgnum;
FolderItem *folder;
gint val = -1;
- gchar *msgpath;
+ gchar *msgpath = NULL;
compose_allow_user_actions (compose, FALSE);
compose->sending = TRUE;
if (compose_check_entries(compose, TRUE) == FALSE)
goto bail;
- val = compose_queue(compose, &msgnum, &folder);
+ val = compose_queue(compose, &msgnum, &folder, &msgpath);
if (val) {
if (val == -4) {
} else if (val == -3) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Signature failed."));
- } else if (val == -2) {
+ } 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."));
"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);
}
return 0;
}
- msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath);
- g_free(msgpath);
-
+ if (msgpath == NULL) {
+ msgpath = folder_item_fetch_msg(folder, msgnum);
+ val = procmsg_send_message_queue(msgpath);
+ g_free(msgpath);
+ } else {
+ val = procmsg_send_message_queue(msgpath);
+ g_unlink(msgpath);
+ g_free(msgpath);
+ }
if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
compose->sending = FALSE;
compose_allow_user_actions (compose, TRUE);
"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;
}
return -1;
bail:
compose_allow_user_actions (compose, TRUE);
compose->sending = FALSE;
+ compose->modified = TRUE;
return -1;
}
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 {
"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;
}
}
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)
+static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath)
{
- return compose_queue_sub (compose, msgnum, item, FALSE);
+ return compose_queue_sub (compose, msgnum, item, msgpath, FALSE);
}
-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)
{
FolderItem *queue;
gchar *tmp;
}
}
- 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);
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);
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);
+ compose_remove_reedit_target(compose, FALSE);
}
if ((msgnum != NULL) && (item != NULL)) {
#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
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,
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));
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);
+
+ 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)
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);
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);
+ if (compose->toolbar->sig_btn)
+ gtk_widget_set_sensitive(compose->toolbar->sig_btn, ensitive);
+ 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 */
Compose *compose = (Compose *)data;
gint val;
- val = compose_queue_sub(compose, NULL, NULL, TRUE);
+ val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE);
if (!val)
compose_close(compose);
else if (val == -2) {
static gboolean lock = FALSE;
MsgInfo *newmsginfo;
FILE *fp;
+ gboolean target_locked = FALSE;
if (lock) return;
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) {
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 (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))
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) {
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;
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);
g_free(body);
}
+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