#include "folder.h"
#include "addr_compl.h"
#include "quote_fmt.h"
-#include "template.h"
#include "undo.h"
#include "foldersel.h"
#include "toolbar.h"
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>"},
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");
}
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;
gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
gint walk_pos;
- if (!prev_autowrap)
+ 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;
}
colorize:
- if (!prev_autowrap)
+ 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_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);
gint cursor_pos = 0;
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);
gtk_text_buffer_place_cursor(buffer, &iter);
}
+ /* 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)
{
compose_list = g_list_remove(compose_list, compose);
#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);
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) {
}
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;
projects / claws.git / blobdiff