/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto
*
* 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 <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtktreeview.h>
-#warning FIXME_GTK2
-/* #include <gtk/gtkthemes.h> */
+
#include <gtk/gtkdnd.h>
#include <stdio.h>
#include <stdlib.h>
Compose *compose_generic_new (PrefsAccount *account,
const gchar *to,
FolderItem *item,
- GPtrArray *attach_files);
+ GPtrArray *attach_files,
+ GList *listAddress );
static Compose *compose_create (PrefsAccount *account,
ComposeMode mode);
gboolean check_subject);
static void compose_write_attach (Compose *compose,
FILE *fp);
-static gint compose_write_headers (Compose *compose,
- FILE *fp,
+static gchar *compose_get_header (Compose *compose,
const gchar *charset,
EncodingType encoding,
gboolean is_draft);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
static void compose_update_priority_menu_item(Compose * compose);
+static void compose_add_field_list ( Compose *compose,
+ GList *listAddress );
+
/* callback functions */
static gboolean compose_edit_size_alloc (GtkEditable *widget,
static void compose_advanced_action_cb (Compose *compose,
ComposeCallAdvancedAction action);
-static void compose_grab_focus_cb (GtkWidget *widget,
+static gboolean compose_grab_focus_cb (GtkWidget *widget,
+ Compose *compose);
+static gboolean compose_grab_focus_before_cb (GtkWidget *widget,
Compose *compose);
static void compose_changed_cb (GtkTextBuffer *textbuf,
Compose *compose);
+static void compose_toggle_autowrap_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
+
#if 0
static void compose_toggle_to_cb (gpointer data,
guint action,
static void compose_update_gnupg_mode_menu_item(Compose * compose);
static void activate_gnupg_mode (Compose *compose,
PrefsAccount *account);
+static void compose_use_signing(Compose *compose, gboolean use_signing);
+static void compose_use_encryption(Compose *compose, gboolean use_encryption);
#endif
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
+static void compose_allow_user_actions (Compose *compose, gboolean allow);
+
#if USE_ASPELL
static void compose_check_all (Compose *compose);
static void compose_highlight_all (Compose *compose);
static gboolean compose_send_control_enter (Compose *compose);
static gint compose_defer_auto_save_draft (Compose *compose);
+static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
static GtkItemFactoryEntry compose_popup_entries[] =
{
static GtkItemFactoryEntry compose_entries[] =
{
{N_("/_File"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_File/_Save"),
+ "<control>S", compose_draft_cb, 1, NULL},
+ {N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Attach file"), "<control>M", compose_attach_cb, 0, NULL},
{N_("/_File/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
{N_("/_File/Insert si_gnature"), "<control>G", compose_insert_sig_cb, 0, NULL},
"<control>L", compose_wrap_line, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
"<control><alt>L", compose_wrap_line_all, 0, NULL},
+ {N_("/_Edit/Aut_o wrapping"), "<shift><control>L", compose_toggle_autowrap_cb, 0, "<ToggleItem>"},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/Edit with e_xternal editor"),
"<shift><control>X", compose_ext_editor_cb, 0, NULL},
#if USE_ASPELL
compose_send_cb, 0, NULL},
{N_("/_Message/Send _later"), "<shift><control>S",
compose_send_later_cb, 0, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Save to _draft folder"),
- "<shift><control>D", compose_draft_cb, 0, NULL},
- {N_("/_Message/Save and _keep editing"),
- "<control>S", compose_draft_cb, 1, NULL},
#if 0 /* NEW COMPOSE GUI */
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
{N_("/_Message/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
- {N_("/_Message/Mode/MIME"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_DETACH, "<RadioItem>"},
+ {N_("/_Message/Mode"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/Mode/MIME"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_DETACH, "<RadioItem>"},
{N_("/_Message/Mode/Inline"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_INLINE, "/Message/Mode/MIME"},
#endif /* USE_GPGME */
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
GPtrArray *attach_files)
{
- return compose_generic_new(account, mailto, NULL, attach_files);
+ return compose_generic_new(account, mailto, NULL, attach_files, NULL);
}
Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
{
- return compose_generic_new(account, NULL, item, NULL);
+ return compose_generic_new(account, NULL, item, NULL, NULL);
+}
+
+Compose *compose_new_with_list( PrefsAccount *account, GList *listAddress )
+{
+ return compose_generic_new( account, NULL, NULL, NULL, listAddress );
}
Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderItem *item,
- GPtrArray *attach_files)
+ GPtrArray *attach_files, GList *listAddress )
{
Compose *compose;
GtkTextView *textview;
GtkTextBuffer *textbuf;
GtkTextIter iter;
GtkItemFactory *ifactory;
- gboolean grab_focus_on_last = TRUE;
if (item && item->prefs && item->prefs->enable_default_account)
account = account_find_from_id(item->prefs->default_account);
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ undo_block(compose->undostruct);
#ifdef USE_ASPELL
if (item && item->prefs && item->prefs->enable_default_dictionary &&
compose->gtkaspell)
} else if (item && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
- compose_entry_select(compose, item->prefs->default_to);
- grab_focus_on_last = FALSE;
+ compose_entry_mark_default_to(compose, item->prefs->default_to);
}
if (item && item->ret_rcpt) {
- menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+ menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
}
} else {
if (mailto) {
*/
menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
}
+ compose_add_field_list( compose, listAddress );
if (attach_files) {
gint i;
g_free(folderidentifier);
}
- /* Grab focus on last header only if no default_to was set */
- if (grab_focus_on_last)
- gtk_widget_grab_focus(compose->header_last->entry);
+ gtk_widget_grab_focus(compose->header_last->entry);
undo_unblock(compose->undostruct);
Compose *compose;
PrefsAccount *account = NULL;
PrefsAccount *reply_account;
- GtkTextBuffer *buffer;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
GtkTextIter iter;
+ int cursor_pos;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
compose = compose_create(account, COMPOSE_REPLY);
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_toggle(ifactory, "/Message/Remove references", FALSE);
+ menu_set_active(ifactory, "/Message/Remove references", FALSE);
menu_set_sensitive(ifactory, "/Message/Remove references", TRUE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
compose->replyinfo = procmsg_msginfo_copy(msginfo);
if (msginfo->folder && msginfo->folder->ret_rcpt)
- menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+ menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
/* Set save folder */
if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
to_sender, followup_and_reply_to);
compose_show_first_last_header(compose, TRUE);
+ textview = (GTK_TEXT_VIEW(compose->text));
+ textbuf = gtk_text_view_get_buffer(textview);
+
+ undo_block(compose->undostruct);
#ifdef USE_ASPELL
if (msginfo->folder && msginfo->folder->prefs &&
msginfo->folder->prefs &&
if (quote && prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
- buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
- gtk_text_buffer_get_start_iter(buffer, &iter);
- gtk_text_buffer_place_cursor(buffer, &iter);
+ cursor_pos = quote_fmt_get_cursor_pos();
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
+
+ if (quote && prefs_common.linewrap_quote) {
+ compose_wrap_line_all(compose);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
+ }
gtk_widget_grab_focus(compose->text);
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
- if (msginfo->folder->prefs->enable_default_account)
- account = account_find_from_id(msginfo->folder->prefs->default_account);
- if (!account)
- account = msginfo->folder->folder->account;
- if (!account && msginfo->to && prefs_common.forward_account_autosel) {
- gchar *to;
- Xstrdup_a(to, msginfo->to, return NULL);
- extract_address(to);
- account = account_find_from_address(to);
- }
-
- if (!account && prefs_common.forward_account_autosel) {
- gchar cc[BUFFSIZE];
- if (!procheader_get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
- extract_address(cc);
- account = account_find_from_address(cc);
- }
- }
-
- if (account == NULL) {
+ if (!account &&
+ !(account = compose_guess_forward_account_from_msginfo
+ (msginfo)))
account = cur_account;
- /*
- account = msginfo->folder->folder->account;
- if (!account) account = cur_account;
- */
- }
- g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, COMPOSE_FORWARD);
gchar *msgfile;
g_return_val_if_fail(msginfo_list != NULL, NULL);
-
- for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
- if ( ((MsgInfo *)msginfo->data)->folder == NULL )
+
+ for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next)
+ if (((MsgInfo *)msginfo->data)->folder == NULL)
return NULL;
- }
- if (account == NULL) {
+ /* guess account from first selected message */
+ if (!account &&
+ !(account = compose_guess_forward_account_from_msginfo
+ (msginfo_list->data)))
account = cur_account;
- /*
- account = msginfo->folder->folder->account;
- if (!account) account = cur_account;
- */
- }
+
g_return_val_if_fail(account != NULL, NULL);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
GtkTextIter iter;
FILE *fp;
gchar buf[BUFFSIZE];
+#ifdef USE_GPGME
+ gboolean use_signing = FALSE;
+ gboolean use_encryption = FALSE;
+ gboolean gnupg_mode = FALSE;
+#endif
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
gchar queueheader_buf[BUFFSIZE];
- gint id;
+ gint id, param;
/* Select Account from queue headers */
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Account-Id:")) {
- id = atoi(&queueheader_buf[22]);
+ id = atoi(&queueheader_buf[strlen("X-Sylpheed-Account-Id:")]);
account = account_find_from_id(id);
}
if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "NAID:")) {
- id = atoi(&queueheader_buf[5]);
+ id = atoi(&queueheader_buf[strlen("NAID:")]);
account = account_find_from_id(id);
}
if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "MAID:")) {
- id = atoi(&queueheader_buf[5]);
+ id = atoi(&queueheader_buf[strlen("MAID:")]);
account = account_find_from_id(id);
}
if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "S:")) {
account = account_find_from_address(queueheader_buf);
}
+#ifdef USE_GPGME
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Sign:")) {
+ param = atoi(&queueheader_buf[strlen("X-Sylpheed-Sign:")]);
+ use_signing = param;
+
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Encrypt:")) {
+ param = atoi(&queueheader_buf[strlen("X-Sylpheed-Encrypt:")]);
+ use_encryption = param;
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Gnupg-Mode:")) {
+ param = atoi(&queueheader_buf[strlen("X-Sylpheed-Gnupg-Mode:")]);
+ gnupg_mode = param;
+ }
+#endif
+ 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;
+ }
} else
account = msginfo->folder->folder->account;
g_return_if_fail(account != NULL);
compose = compose_create(account, COMPOSE_REEDIT);
+#ifdef USE_GPGME
+ compose->gnupg_mode = gnupg_mode;
+ compose_use_signing(compose, use_signing);
+ compose_use_encryption(compose, use_encryption);
+#endif
compose->targetinfo = procmsg_msginfo_copy(msginfo);
if (msginfo->folder->stype == F_QUEUE
mark = gtk_text_buffer_get_insert(textbuf);
gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
+ g_signal_handlers_block_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning("Can't get text part\n");
else {
}
fclose(fp);
}
+
compose_attach_parts(compose, msginfo);
+ g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
gtk_widget_grab_focus(compose->text);
if (prefs_common.auto_exteditor)
menu_set_sensitive(ifactory, "/Property...", FALSE);
ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_sensitive(ifactory, "/File/Save", FALSE);
menu_set_sensitive(ifactory, "/File/Insert file", FALSE);
menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
menu_set_sensitive(ifactory, "/Edit", FALSE);
- menu_set_sensitive(ifactory, "/Message/Save to draft folder", FALSE);
- menu_set_sensitive(ifactory, "/Message/Save and keep editing", FALSE);
#if USE_GPGME
menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
return compose;
}
compose_add_header_entry(compose, header, (gchar *)address);
}
-void compose_entry_select (Compose *compose, const gchar *mailto)
+void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
- GSList *header_list;
+ static GtkStyle *bold_style = NULL;
+ static GdkColor bold_color;
+ GSList *h_list;
+ GtkEntry *entry;
- for (header_list = compose->header_list; header_list != NULL; header_list = header_list->next) {
- GtkEntry * entry = GTK_ENTRY(((ComposeHeaderEntry *)header_list->data)->entry);
-
- if (gtk_entry_get_text(entry) && !g_strcasecmp(gtk_entry_get_text(entry), mailto)) {
- gtk_entry_select_region(entry, 0, -1);
- gtk_widget_grab_focus(GTK_WIDGET(entry));
+ 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_strcasecmp(gtk_entry_get_text(entry), mailto)) {
+ gtk_widget_ensure_style(GTK_WIDGET(entry));
+ if (!bold_style) {
+ PangoFontDescription *font_desc = NULL;
+ gtkut_convert_int_to_gdk_color
+ (prefs_common.color_new, &bold_color);
+ bold_style = gtk_style_copy(gtk_widget_get_style
+ (GTK_WIDGET(entry)));
+ if (BOLD_FONT)
+ font_desc = pango_font_description_from_string
+ (BOLD_FONT);
+ if (font_desc) {
+ if (bold_style->font_desc)
+ pango_font_description_free
+ (bold_style->font_desc);
+ bold_style->font_desc = font_desc;
+ }
+ bold_style->fg[GTK_STATE_NORMAL] = bold_color;
+ }
+ gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
}
}
}
case A_EXTEDITOR:
compose_ext_editor_cb(compose, 0, NULL);
break;
- case A_LINEWRAP:
+ case A_LINEWRAP_CURRENT:
compose_wrap_line(compose);
break;
+ case A_LINEWRAP_ALL:
+ compose_wrap_line_all(compose);
+ break;
case A_ADDRBOOK:
compose_address_cb(compose, 0, NULL);
break;
GtkTextMark *mark;
GtkTextIter iter;
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
lastp = strchr(p, '\n');
len = lastp ? lastp - p + 1 : -1;
+
gtk_text_buffer_insert(buffer, &iter, p, len);
+
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
if (lastp)
p = lastp + 1;
else
}
if (msginfo->subject && *msginfo->subject) {
- gchar *buf, *buf2, *p;
+ gchar *buf, *buf2;
+ guchar *p;
buf = p = g_strdup(msginfo->subject);
p += subject_get_prefix_length(p);
GtkTextIter iter;
gint cur_pos;
+
g_return_if_fail(compose->account != NULL);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
cur_pos = gtk_text_iter_get_offset (&iter);
gtk_text_buffer_get_iter_at_offset (buffer, &iter, cur_pos);
gtk_text_buffer_place_cursor (buffer, &iter);
+
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
}
static gchar *compose_get_signature_str(Compose *compose)
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
while (fgets(buf, sizeof(buf), fp) != NULL) {
-#warning FIXME_GTK2
-#if 1 /* FIXME_GTK2 */
const gchar *cur_encoding = conv_get_current_charset_str();
- gchar *str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
+ gchar *str = NULL;
+ if (!g_utf8_validate(buf, -1, NULL))
+ str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
+ else
+ str = g_strdup(buf);
if (!str) continue;
gtk_text_buffer_insert(buffer, &iter, str, -1);
g_free (str);
-#endif /* FIXME_GTK2 */
}
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
fclose(fp);
if (badtxt)
#if 0 /* NEW COMPOSE GUI */
if (!compose->use_attach) {
GtkItemFactory *ifactory;
- GtkWidget *menuitem;
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menuitem = gtk_item_factory_get_item(ifactory,
- "/View/Attachment");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- TRUE);
+ menu_set_active(ifactory, "/View/Attachment", TRUE);
}
#endif
ainfo = g_new0(AttachInfo, 1);
ifactory = gtk_item_factory_from_widget(compose->menubar);
menuitem = gtk_item_factory_get_item
(ifactory, "/Message/Sign");
+
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
use_signing);
compose_update_gnupg_mode_menu_item(compose);
}
+
+static void compose_use_encryption(Compose *compose, gboolean use_encryption)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ compose->use_encryption = use_encryption;
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Encrypt");
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ use_encryption);
+ compose_update_gnupg_mode_menu_item(compose);
+}
#endif /* USE_GPGME */
#define NEXT_PART_NOT_CHILD(info) \
g_free(tmp); \
}
-#define INDENT_CHARS ">|#"
+#define DISP_WIDTH(len) \
+ ((len > 2 && conv_get_current_charset() == C_UTF_8) ? 2 : \
+ (len == 2 && conv_get_current_charset() == C_UTF_8) ? 1 : len)
+
#define SPACE_CHARS " \t"
-#warning FIXME_GTK2
static void compose_wrap_line(Compose *compose)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
} else {
if (ch_len == 1
&& strchr(prefs_common.quote_chars, *cbuf))
- quoted = TRUE;
- else if (ch_len != 1 || !isspace(*cbuf))
- quoted = FALSE;
+ quoted = 1;
+ else if (ch_len != 1 || !isspace(*(guchar *)cbuf))
+ quoted = 0;
line_end = FALSE;
}
ch_len = 1;
}
- if (ch_len == 1 && isspace(*cbuf))
- space = TRUE;
+ if (ch_len == 1 && isspace(*(guchar *)cbuf))
+ space = 1;
if (ch_len == 1 && *cbuf == '\n') {
gboolean replace = FALSE;
gtk_text_iter_forward_char(&next_iter);
- if (last_ch_len == 1 && !isspace(last_ch)) {
+ if (last_ch_len == 1 && !isspace((guchar)last_ch)) {
if (cur_pos + 1 < p_end) {
GET_CHAR(&next_iter, cbuf, ch_len);
- if (ch_len == 1 && !isspace(*cbuf))
+ if (ch_len == 1 &&
+ !isspace(*(guchar *)cbuf))
replace = TRUE;
}
}
gtk_text_iter_backward_char(&prev_iter);
GET_CHAR(&prev_iter, cbuf, ch_len);
- if (ch_len == 1 && isspace(*cbuf)) {
+ if (ch_len == 1 && isspace(*(guchar *)cbuf)) {
gtk_text_buffer_delete(textbuf, &prev_iter, &iter);
iter = prev_iter;
p_end--;
break;
case WAIT_FOR_INDENT_CHAR_OR_SPACE:
if (is_indent == FALSE && is_space == FALSE &&
- !isupper(cbuf[0]))
+ !isupper((guchar)cbuf[0]))
goto out;
if (is_space == TRUE) {
alnum_cnt = 0;
}
break;
case WAIT_FOR_INDENT_CHAR:
- if (is_indent == FALSE && !isupper(cbuf[0]))
+ if (is_indent == FALSE && !isupper((guchar)cbuf[0]))
goto out;
if (is_indent == TRUE) {
if (alnum_cnt > 0
return ins_len;
}
+static gboolean is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, guint start_pos)
+{
+ char *text = NULL;
+ GtkTextIter iter;
+ GtkTextIter end_iter;
+ if (!compose->account->sig_sep)
+ return FALSE;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, start_pos+1);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep)+1);
+
+ if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),
+ compose->account->sig_sep)) {
+ /* check \n */
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
+ start_pos+strlen(compose->account->sig_sep)+1);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep)+2);
+
+ if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),"\n"));
+ return TRUE;
+
+
+ }
+
+ return FALSE;
+}
+
/* check if we should join the next line */
static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
guint start_pos, guint tlen,
gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
start_pos + indent_len);
GET_CHAR(&iter, cbuf, ch_len);
+
if (ch_len > 0 && (cbuf[0] != '\n'))
do_join = TRUE;
}
static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
{
-#if 0
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *textbuf = gtk_text_view_get_buffer(text);
GtkTextIter iter, end_iter;
guint linewrap_len = prefs_common.linewrap_len;
gchar *qfmt = prefs_common.quotemark;
gchar cbuf[CHAR_BUF_SIZE];
-
+ GtkTextMark *cursor_mark = gtk_text_buffer_get_insert(textbuf);
+
tlen = gtk_text_buffer_get_char_count(textbuf);
for (; cur_pos < tlen; cur_pos++) {
/* fix line length for tabs */
if (ch_len == 1 && *cbuf == '\t') {
-#warning FIXME_GTK2
- /* guint tab_width = text->default_tab_width; */
guint tab_width = 8;
guint tab_offset = line_len % tab_width;
- if (tab_offset) {
- line_len += tab_width - tab_offset - 1;
- cur_len = line_len;
- }
+ line_len += tab_width - tab_offset - 1;
+ cur_len = line_len;
}
/* we have encountered line break */
/* should we join the next line */
if ((autowrap || i_len != cur_len) && do_delete &&
+ !is_sig_separator(compose, textbuf, cur_pos+i_len) &&
join_next_line_is_needed
- (textbuf, cur_pos + 1, tlen, i_len, autowrap))
+ (textbuf, cur_pos + 1, tlen, i_len, autowrap)) {
do_delete = TRUE;
- else
+ } else
do_delete = FALSE;
/* skip delete if it is continuous URL */
/* insert space if it's alphanumeric */
if ((cur_pos != line_pos) &&
- ((clen > 1) || isalnum(cb[0]))) {
+ ((clen > 1) || isalnum((guchar)cb[0]))) {
+ GtkTextIter cursor_iter;
+ gboolean go_back = FALSE;
+ gtk_text_buffer_get_iter_at_mark(textbuf, &cursor_iter, cursor_mark);
+ if (gtk_text_iter_get_offset(&iter) ==
+ gtk_text_iter_get_offset(&cursor_iter))
+ go_back = TRUE;
+
gtk_text_buffer_insert(textbuf, &iter,
" ", 1);
+ if (go_back) {
+ gtk_text_buffer_get_iter_at_mark(textbuf, &cursor_iter, cursor_mark);
+ gtk_text_iter_backward_chars(&cursor_iter, 1);
+ gtk_text_buffer_place_cursor(textbuf, &cursor_iter);
+ }
tlen++;
}
dump_text(text, line_pos, tlen, 1);
#endif
/* move beginning of line if we are on LF */
- GET_CHAR(line_pos, cb, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos);
+ GET_CHAR(&iter, cb, clen);
if (clen == 1 && *cb == '\n')
line_pos++;
#ifdef WRAP_DEBUG
}
/* possible line break */
- if (ch_len == 1 && isspace(*cbuf)) {
+ if (ch_len == 1 && isspace(*(guchar *)cbuf)) {
line_pos = cur_pos + 1;
line_len = cur_len + ch_len;
}
#endif
/* force wrapping if it is one long word but not URL */
if (line_pos - p_pos <= i_len)
- if (!gtk_stext_is_uri_string
- (text, line_pos, tlen))
+ if (!gtkut_text_buffer_is_uri_string
+ (textbuf, line_pos, tlen))
line_pos = cur_pos - 1;
#ifdef WRAP_DEBUG
g_print("new line_pos=%d\n", line_pos);
#endif
- GET_CHAR(line_pos - 1, cbuf, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos - 1);
+ GET_CHAR(&iter, cbuf, clen);
/* if next character is space delete it */
- if (clen == 1 && isspace(*cbuf)) {
+ if (clen == 1 && isspace(*(guchar *)cbuf)) {
if (p_pos + i_len != line_pos ||
- !gtk_stext_is_uri_string
- (text, line_pos, tlen)) {
- STEXT_FREEZE();
+ !gtkut_text_buffer_is_uri_string
+ (textbuf, line_pos, tlen)) {
/* workaround for correct cursor
position */
if (set_editable_pos == FALSE) {
- editable_pos = gtk_editable_get_position(GTK_EDITABLE(text));
+ GtkTextMark *ins = gtk_text_buffer_get_insert(textbuf);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &iter, ins);
+ editable_pos = gtk_text_iter_get_offset(&iter);
if (editable_pos == line_pos)
set_editable_pos = TRUE;
}
- gtk_stext_set_point(text, line_pos);
- gtk_stext_backward_delete(text, 1);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos-1);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &end_iter,
+ line_pos);
+ gtk_text_buffer_delete(textbuf, &iter, &end_iter);
+ //gtk_stext_set_point(text, line_pos);
+ //gtk_stext_backward_delete(text, 1);
tlen--;
cur_pos--;
line_pos--;
/* if it is URL at beginning of line don't wrap */
if (p_pos + i_len == line_pos &&
- gtk_stext_is_uri_string(text, line_pos, tlen)) {
+ gtkut_text_buffer_is_uri_string(textbuf, line_pos, tlen)) {
#ifdef WRAP_DEBUG
g_print("found URL at ");
dump_text(text, line_pos, tlen, 1);
}
/* insert CR */
- STEXT_FREEZE();
- gtk_stext_set_point(text, line_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- gtk_stext_compact_buffer(text);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos);
+ gtk_text_buffer_insert(textbuf, &iter, "\n", 1);
+ //gtk_stext_set_point(text, line_pos);
+ //gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ //gtk_stext_compact_buffer(text);
tlen++;
line_pos++;
/* for loop will increase it */
/* start over with current line */
is_new_line = TRUE;
line_len = cur_len = 0;
- if (autowrap || i_len > 0)
+ if (autowrap || i_len > 0) {
do_delete = TRUE;
- else
+ } else
do_delete = FALSE;
#ifdef WRAP_DEBUG
g_print("after CR insert ");
/* should we insert quotation ? */
if (linewrap_quote && i_len) {
/* only if line is not already quoted */
- if (!gtk_stext_str_compare
- (text, line_pos, tlen, qfmt)) {
+ if (!gtkut_text_buffer_str_compare
+ (textbuf, line_pos, tlen, qfmt)) {
guint ins_len;
-
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, line_pos);
+
if (line_pos - p_pos > i_len) {
ins_len = ins_quote
- (text, i_len, p_pos,
+ (textbuf, &iter, i_len, p_pos,
tlen, qfmt);
tlen += ins_len;
}
gtk_text_buffer_get_iter_at_offset(textbuf, &iter, editable_pos);
gtk_text_buffer_place_cursor(textbuf, &iter);
}
-#endif
}
#undef GET_CHAR
static void compose_select_account(Compose *compose, PrefsAccount *account,
gboolean init)
{
- GtkWidget *menuitem;
GtkItemFactory *ifactory;
g_return_if_fail(account != NULL);
gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
compose->use_newsgroups = TRUE;
- menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
- gtk_widget_set_sensitive(menuitem, TRUE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
- gtk_widget_set_sensitive(menuitem, TRUE);
-
+ menu_set_active(ifactory, "/View/To", FALSE);
+ menu_set_sensitive(ifactory, "/View/To", TRUE);
+ menu_set_active(ifactory, "/View/Cc", FALSE);
+ menu_set_sensitive(ifactory, "/View/Cc", TRUE);
menu_set_sensitive(ifactory, "/View/Followup to", TRUE);
} else {
gtk_widget_hide(compose->newsgroups_hbox);
gtk_widget_queue_resize(compose->table_vbox);
compose->use_newsgroups = FALSE;
- menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
-
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Followup to");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
- gtk_widget_set_sensitive(menuitem, FALSE);
+ menu_set_active(ifactory, "/View/To", TRUE);
+ menu_set_sensitive(ifactory, "/View/To", FALSE);
+ menu_set_active(ifactory, "/View/Cc", TRUE);
+ menu_set_sensitive(ifactory, "/View/Cc", FALSE);
+ menu_set_active(ifactory, "/View/Followup to", FALSE);
+ menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
}
if (account->set_autocc) {
COMPOSE_ENTRY_REPLY_TO);
}
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.show_ruler);
#endif
#if USE_GPGME
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_sign);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_encrypt);
+ if (account->default_sign)
+ menu_set_active(ifactory, "/Message/Sign", TRUE);
+ else
+ menu_set_active(ifactory, "/Message/Sign", FALSE);
+ if (account->default_encrypt)
+ menu_set_active(ifactory, "/Message/Encrypt", TRUE);
+ else
+ menu_set_active(ifactory, "/Message/Encrypt", FALSE);
activate_gnupg_mode(compose, account);
#endif /* USE_GPGME */
{
gint msgnum;
FolderItem *folder;
- gint val;
+ gint val = -1;
gchar *msgpath;
+ compose_allow_user_actions (compose, FALSE);
+ compose->sending = TRUE;
+
if (compose_check_entries(compose, TRUE) == FALSE)
- return -1;
+ goto bail;
val = compose_queue(compose, &msgnum, &folder);
+
if (val) {
alertpanel_error(_("Could not queue message for sending"));
- return -1;
+ goto bail;
+ }
+
+
+ if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ gtk_widget_destroy(compose->window);
+ /* No more compose access in the normal codepath
+ * after this point! */
}
if (msgnum == 0) {
- alertpanel_error(_("The message was queued but could not be sent.\nUse \"Send queued messages\" from the main window to retry."));
+ 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_allow_user_actions (compose, TRUE);
+ }
return 0;
}
val = procmsg_send_message_queue(msgpath);
g_free(msgpath);
- folder_item_remove_msg(folder, msgnum);
-
- folder_item_scan(folder);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ compose_allow_user_actions (compose, TRUE);
+ if (val != 0) {
+ folder_item_remove_msg(folder, msgnum);
+ folder_item_scan(folder);
+ }
+ }
+
+ if (val == 0) {
+ folder_item_remove_msg(folder, msgnum);
+ folder_item_scan(folder);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
+ gtk_widget_destroy(compose->window);
+ }
+
+ return 0;
+
+bail:
+ compose_allow_user_actions (compose, TRUE);
+ compose->sending = FALSE;
- return val;
+ return -1;
}
#if 0 /* compose restructure */
}
/* write to temporary file */
- g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%08x",
- get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
+ g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%p",
+ get_tmp_dir(), G_DIR_SEPARATOR, compose);
if (prefs_common.linewrap_at_send)
compose_wrap_line_all(compose);
}
}
- /* queue message if failed to send */
- if (ok < 0) {
- if (prefs_common.queue_msg) {
- AlertValue val;
-
- val = alertpanel
- (_("Queueing"),
- _("Error occurred while sending the message.\n"
- "Put this message into queue folder?"),
- _("OK"), _("Cancel"), NULL);
- if (G_ALERTDEFAULT == val) {
- ok = compose_queue(compose, tmp);
- if (ok < 0)
- alertpanel_error(_("Can't queue the message."));
- }
- } else
- alertpanel_error_log(_("Error occurred while sending the message."));
- } else {
+ if (ok == 0) {
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
}
/* Resent-Message-ID */
if (compose->account->gen_msgid) {
compose_generate_msgid(buf, sizeof(buf));
- fprintf(fp, "Resent-Message-Id: <%s>\n", buf);
+ fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
FILE *fdest;
size_t len;
gchar buf[BUFFSIZE];
+ gchar *header;
if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
g_warning("can't change file mode\n");
}
- while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
+ while (procheader_get_one_field_asis(buf, sizeof(buf), fp) != -1) {
/* should filter returnpath, delivered-to */
if (g_strncasecmp(buf, "Return-Path:",
strlen("Return-Path:")) == 0 ||
gchar *canon_buf;
const gchar *out_codeset;
EncodingType encoding;
+ gboolean already_encoded = FALSE;
+ gchar *header;
if ((fp = fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
gtk_text_buffer_get_start_iter(buffer, &start);
gtk_text_buffer_get_end_iter(buffer, &end);
chars = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- len = strlen(chars);
if (is_ascii_str(chars)) {
buf = chars;
chars = NULL;
compose->use_signing && !compose->gnupg_mode &&
encoding == ENC_8BIT)
encoding = ENC_BASE64;
+
+ if (compose->use_encryption && compose->gnupg_mode)
+ encoding = ENC_8BIT; /* this will be encrypted to a 7bit string */
#endif
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
- src_codeset = conv_get_current_charset_str();
- /* if current encoding is US-ASCII, set it the same as
- outgoing one to prevent code conversion failure */
- if (!strcasecmp(src_codeset, CS_US_ASCII))
- src_codeset = out_codeset;
-#else /* FIXME_GTK2 */
src_codeset = CS_UTF_8;
-#endif /* FIXME_GTK2 */
debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
src_codeset, out_codeset, procmime_get_encoding_str(encoding));
buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!buf) {
- AlertValue aval;
+ AlertValue aval = G_ALERTDEFAULT;
gchar *msg;
- msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
+ if (!is_draft) {
+ msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
"%s to %s.\n"
"Send it anyway?"), src_codeset, out_codeset);
- aval = alertpanel
- (_("Error"), msg, _("Yes"), _("+No"), NULL);
- g_free(msg);
-
+ aval = alertpanel_with_type
+ (_("Error"), msg, _("Yes"), _("+No"), NULL, NULL, ALERT_ERROR);
+ g_free(msg);
+ }
+
if (aval != G_ALERTDEFAULT) {
g_free(chars);
fclose(fp);
#if USE_GPGME
if (!is_draft && compose->use_signing && compose->gnupg_mode) {
+ gchar *tmpbuf;
+
if (compose_clearsign_text(compose, &buf) < 0) {
g_warning("clearsign failed\n");
fclose(fp);
g_free(buf);
return -1;
}
+ tmpbuf = conv_codeset_strdup(buf, CS_UTF_8, out_codeset);
+ if (tmpbuf) {
+ g_free(buf);
+ buf = tmpbuf;
+ }
}
#endif
/* write headers */
- if (compose_write_headers
- (compose, fp, out_codeset, encoding, is_draft) < 0) {
+ header = compose_get_header(compose, out_codeset, encoding, is_draft);
+ if (header == NULL || fwrite(header, sizeof(gchar), strlen(header), fp) < strlen(header)) {
g_warning("can't write headers\n");
fclose(fp);
/* unlink(file); */
+ g_free(header);
g_free(buf);
return -1;
}
+ g_free(header);
if (compose_use_attach(compose)) {
#if USE_GPGME
} else if (encoding == ENC_QUOTED_PRINTABLE) {
gchar *outbuf;
size_t outlen;
-
- outbuf = g_malloc(len * 4);
- qp_encode_line(outbuf, buf);
- outlen = strlen(outbuf);
+ if (!already_encoded) {
+ outbuf = g_malloc(len * 4);
+ qp_encode_line(outbuf, buf);
+ outlen = strlen(outbuf);
+ } else {
+ outbuf = g_strdup(buf);
+ outlen = len;
+ }
if (fwrite(outbuf, sizeof(gchar), outlen, fp) != outlen) {
FILE_OP_ERROR(file, "fwrite");
fclose(fp);
}
if (compose->use_encryption) {
if (rfc2015_encrypt(file, compose->to_list,
- compose->gnupg_mode) < 0) {
+ compose->gnupg_mode,
+ out_codeset) < 0) {
unlink(file);
return -1;
}
gtk_text_buffer_get_end_iter(buffer, &end);
tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
-#warning FIXME_GTK2
-#if 1 /* FIXME_GTK2 */
src_codeset = CS_UTF_8;
dest_codeset = conv_get_current_charset_str();
chars = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
g_free(tmp);
if (!chars) return -1;
-#endif /* FIXME_GTK2 */
/* write body */
len = strlen(chars);
}
/* add queue header */
- tmp = g_strdup_printf("%s%cqueue.%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, compose);
if ((fp = fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
if (newsac) {
fprintf(fp, "NAID:%d\n", newsac->account_id);
}
+#ifdef USE_GPGME
+ fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
+ fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Sylpheed-Gnupg-Mode:%d\n", compose->gnupg_mode);
+#endif
+
/* Save copy folder */
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
fprintf(fp, "\n--%s--\n", compose->boundary);
}
-#define QUOTE_IF_REQUIRED(out, str) \
-{ \
- if (*str != '"' && strpbrk(str, ",.[]<>")) { \
- gchar *__tmp; \
- gint len; \
- \
- len = strlen(str) + 3; \
- Xalloca(__tmp, len, return -1); \
- g_snprintf(__tmp, len, "\"%s\"", str); \
- out = __tmp; \
- } else { \
- Xstrdup_a(out, str, return -1); \
- } \
-}
-
-#define PUT_RECIPIENT_HEADER(header, str) \
-{ \
- if (*str != '\0') { \
- gchar *dest; \
- Xstrdup_a(dest, str, return -1); \
- g_strstrip(dest); \
- if (*dest != '\0') { \
- compose->to_list = address_list_append \
- (compose->to_list, dest); \
- compose_convert_header \
- (buf, sizeof(buf), dest, strlen(header) + 2, \
- TRUE); \
- fprintf(fp, "%s: %s\n", header, buf); \
- } \
- } \
+#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)
-static gint compose_write_headers_from_headerlist(Compose *compose,
- FILE *fp,
- const gchar *header,
- const gchar *seperator)
+static void compose_add_headerfield_from_headerlist(Compose *compose,
+ GString *header,
+ const gchar *fieldname,
+ const gchar *seperator)
{
- gchar *str, *header_w_colon, *trans_hdr;
- gboolean write_header = FALSE;
+ gchar *str, *fieldname_w_colon, *trans_fieldname;
+ gboolean add_field = FALSE;
GSList *list;
ComposeHeaderEntry *headerentry;
const gchar * headerentryname;
- GString *headerstr;
+ GString *fieldstr;
- if (IS_IN_CUSTOM_HEADER(header)) {
- return 0;
- }
+ if (IS_IN_CUSTOM_HEADER(fieldname))
+ return;
- debug_print("Writing %s-header\n", header);
+ debug_print("Adding %s-fields\n", fieldname);
- headerstr = g_string_sized_new(64);
+ fieldstr = g_string_sized_new(64);
- header_w_colon = g_strconcat(header, ":", NULL);
- trans_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
+ fieldname_w_colon = g_strconcat(fieldname, ":", NULL);
+ trans_fieldname = (prefs_common.trans_hdr ? gettext(fieldname_w_colon) : fieldname_w_colon);
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if (!g_strcasecmp(trans_hdr, headerentryname)) {
- const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(str, entstr, return -1);
+ if (!g_strcasecmp(trans_fieldname, headerentryname)) {
+ str = gtk_editable_get_chars(GTK_EDITABLE(headerentry->entry), 0, -1);
g_strstrip(str);
if (str[0] != '\0') {
- if (write_header)
- g_string_append(headerstr, seperator);
- g_string_append(headerstr, str);
- write_header = TRUE;
+ if (add_field)
+ g_string_append(fieldstr, seperator);
+ g_string_append(fieldstr, str);
+ add_field = TRUE;
}
}
}
- if (write_header) {
+ if (add_field) {
gchar *buf;
- buf = g_new0(gchar, headerstr->len * 4 + 256);
+ buf = g_new0(gchar, fieldstr->len * 4 + 256);
compose_convert_header
- (buf, headerstr->len * 4 + 256, headerstr->str,
- strlen(header) + 2, TRUE);
- fprintf(fp, "%s: %s\n", header, buf);
+ (buf, fieldstr->len * 4 + 256, fieldstr->str,
+ strlen(fieldname) + 2, TRUE);
+ g_string_sprintfa(header, "%s: %s\n", fieldname, buf);
g_free(buf);
}
- g_free(header_w_colon);
- g_string_free(headerstr, TRUE);
+ g_free(fieldname_w_colon);
+ g_string_free(fieldstr, TRUE);
- return(0);
+ return;
}
-static gint compose_write_headers(Compose *compose, FILE *fp,
- const gchar *charset, EncodingType encoding,
- gboolean is_draft)
+static gchar *compose_get_header(Compose *compose, const gchar *charset,
+ EncodingType encoding, gboolean is_draft)
{
gchar buf[BUFFSIZE];
const gchar *entry_str;
gchar *name;
GSList *list;
gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
+ GString *header;
/* struct utsname utsbuf; */
- g_return_val_if_fail(fp != NULL, -1);
- g_return_val_if_fail(charset != NULL, -1);
- g_return_val_if_fail(compose->account != NULL, -1);
- g_return_val_if_fail(compose->account->address != NULL, -1);
+ g_return_val_if_fail(charset != NULL, NULL);
+ 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);
/* Save draft infos */
if (is_draft) {
- fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
- fprintf(fp, "S:%s\n", compose->account->address);
+ g_string_sprintfa(header, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
+ g_string_sprintfa(header, "S:%s\n", compose->account->address);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
- fprintf(fp, "SCF:%s\n", savefolderid);
+ g_string_sprintfa(header, "SCF:%s\n", savefolderid);
g_free(savefolderid);
}
- fprintf(fp, "\n");
+#ifdef USE_GPGME
+ g_string_sprintfa(header, "X-Sylpheed-Sign:%d\n", compose->use_signing);
+ g_string_sprintfa(header, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ g_string_sprintfa(header, "X-Sylpheed-Gnupg-Mode:%d\n", compose->gnupg_mode);
+#endif
+ g_string_sprintfa(header, "\n");
}
/* Date */
if (compose->account->add_date) {
get_rfc822_date(buf, sizeof(buf));
- fprintf(fp, "Date: %s\n", buf);
+ g_string_sprintfa(header, "Date: %s\n", buf);
}
/* From */
- if (!IS_IN_CUSTOM_HEADER("From")) {
- if (compose->account->name && *compose->account->name) {
- compose_convert_header
- (buf, sizeof(buf), compose->account->name,
- strlen("From: "), TRUE);
- QUOTE_IF_REQUIRED(name, buf);
- fprintf(fp, "From: %s <%s>\n",
- name, compose->account->address);
- } else
- fprintf(fp, "From: %s\n", compose->account->address);
- }
+ if (compose->account->name && *compose->account->name) {
+ compose_convert_header
+ (buf, sizeof(buf), compose->account->name,
+ strlen("From: "), TRUE);
+ QUOTE_IF_REQUIRED(name, buf);
+ g_string_sprintfa(header, "From: %s <%s>\n",
+ name, compose->account->address);
+ } else
+ g_string_sprintfa(header, "From: %s\n", compose->account->address);
/* To */
- compose_write_headers_from_headerlist(compose, fp, "To", ", ");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_to) {
- entry_str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- PUT_RECIPIENT_HEADER("To", entry_str);
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "To", ", ");
/* Newsgroups */
- compose_write_headers_from_headerlist(compose, fp, "Newsgroups", ",");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_newsgroups) {
- entry_str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*entry_str != '\0') {
- Xstrdup_a(str, entry_str, return -1);
- g_strstrip(str);
- remove_space(str);
- if (*str != '\0') {
- compose->newsgroup_list =
- newsgroup_list_append
- (compose->newsgroup_list, str);
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Newsgroups: "),
- TRUE);
- fprintf(fp, "Newsgroups: %s\n", buf);
- }
- }
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Newsgroups", ",");
+
/* Cc */
- compose_write_headers_from_headerlist(compose, fp, "Cc", ", ");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_cc) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
- PUT_RECIPIENT_HEADER("Cc", str);
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Cc", ", ");
+
/* Bcc */
- compose_write_headers_from_headerlist(compose, fp, "Bcc", ", ");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_bcc) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
- PUT_RECIPIENT_HEADER("Bcc", str);
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
/* Subject */
- entry_str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*entry_str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
- Xstrdup_a(str, entry_str, return -1);
+ str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
+ gchar *tmpstr;
+
+ tmpstr = g_strdup(str);
+ if (tmpstr == NULL) {
+ g_string_free(header, TRUE);
+ return NULL;
+ }
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
strlen("Subject: "), FALSE);
- fprintf(fp, "Subject: %s\n", buf);
+ g_string_sprintfa(header, "Subject: %s\n", buf);
}
}
/* Message-ID */
if (compose->account->gen_msgid) {
compose_generate_msgid(buf, sizeof(buf));
- fprintf(fp, "Message-Id: <%s>\n", buf);
+ g_string_sprintfa(header, "Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
if (compose->remove_references == FALSE) {
/* In-Reply-To */
if (compose->inreplyto && compose->to_list)
- fprintf(fp, "In-Reply-To: <%s>\n", compose->inreplyto);
+ g_string_sprintfa(header, "In-Reply-To: <%s>\n", compose->inreplyto);
/* References */
if (compose->references)
- fprintf(fp, "References: %s\n", compose->references);
+ g_string_sprintfa(header, "References: %s\n", compose->references);
}
/* Followup-To */
- compose_write_headers_from_headerlist(compose, fp, "Followup-To", ",");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_followupto && !IS_IN_CUSTOM_HEADER("Followup-To")) {
- entry_str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
- if (*entry_str != '\0') {
- Xstrdup_a(str, entry_str, return -1);
- g_strstrip(str);
- remove_space(str);
- if (*str != '\0') {
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Followup-To: "),
- TRUE);
- fprintf(fp, "Followup-To: %s\n", buf);
- }
- }
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Followup-To", ",");
+
/* Reply-To */
- compose_write_headers_from_headerlist(compose, fp, "Reply-To", ", ");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_replyto && !IS_IN_CUSTOM_HEADER("Reply-To")) {
- entry_str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
- if (*entry_str != '\0') {
- Xstrdup_a(str, entry_str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Reply-To: "),
- TRUE);
- fprintf(fp, "Reply-To: %s\n", buf);
- }
- }
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Reply-To", ", ");
+
/* Organization */
if (compose->account->organization &&
+ strlen(compose->account->organization) &&
!IS_IN_CUSTOM_HEADER("Organization")) {
compose_convert_header(buf, sizeof(buf),
compose->account->organization,
strlen("Organization: "), FALSE);
- fprintf(fp, "Organization: %s\n", buf);
+ g_string_sprintfa(header, "Organization: %s\n", buf);
}
/* Program version and system info */
/* uname(&utsbuf); */
if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
!compose->newsgroup_list) {
- fprintf(fp, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
+ g_string_sprintfa(header, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
/* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
if (g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
- fprintf(fp, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
+ g_string_sprintfa(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
cur = cur->next) {
CustomHeader *chdr = (CustomHeader *)cur->data;
- if (strcasecmp(chdr->name, "Date") != 0 &&
- strcasecmp(chdr->name, "From") != 0 &&
- strcasecmp(chdr->name, "To") != 0 &&
- /* strcasecmp(chdr->name, "Sender") != 0 && */
- strcasecmp(chdr->name, "Message-Id") != 0 &&
- strcasecmp(chdr->name, "In-Reply-To") != 0 &&
- strcasecmp(chdr->name, "References") != 0 &&
- strcasecmp(chdr->name, "Mime-Version") != 0 &&
- strcasecmp(chdr->name, "Content-Type") != 0 &&
- strcasecmp(chdr->name, "Content-Transfer-Encoding")
- != 0) {
+ if (custom_header_is_allowed(chdr->name)) {
compose_convert_header
(buf, sizeof(buf),
chdr->value ? chdr->value : "",
strlen(chdr->name) + 2, FALSE);
- fprintf(fp, "%s: %s\n", chdr->name, buf);
+ g_string_sprintfa(header, "%s: %s\n", chdr->name, buf);
}
}
}
/* MIME */
- fprintf(fp, "Mime-Version: 1.0\n");
+ g_string_sprintfa(header, "Mime-Version: 1.0\n");
if (compose_use_attach(compose)) {
compose->boundary = generate_mime_boundary(NULL);
- fprintf(fp,
+ g_string_sprintfa(header,
"Content-Type: multipart/mixed;\n"
" boundary=\"%s\"\n", compose->boundary);
} else {
- fprintf(fp, "Content-Type: text/plain; charset=%s\n", charset);
+ g_string_sprintfa(header, "Content-Type: text/plain; charset=%s\n", charset);
#if USE_GPGME
if (compose->use_signing && !compose->gnupg_mode)
- fprintf(fp, "Content-Disposition: inline\n");
+ g_string_sprintfa(header, "Content-Disposition: inline\n");
#endif
- fprintf(fp, "Content-Transfer-Encoding: %s\n",
+ g_string_sprintfa(header, "Content-Transfer-Encoding: %s\n",
procmime_get_encoding_str(encoding));
}
/* PRIORITY */
switch (compose->priority) {
- case PRIORITY_HIGHEST: fprintf(fp, "Importance: high\n"
+ case PRIORITY_HIGHEST: g_string_sprintfa(header, "Importance: high\n"
"X-Priority: 1 (Highest)\n");
break;
- case PRIORITY_HIGH: fprintf(fp, "Importance: high\n"
+ case PRIORITY_HIGH: g_string_sprintfa(header, "Importance: high\n"
"X-Priority: 2 (High)\n");
break;
case PRIORITY_NORMAL: break;
- case PRIORITY_LOW: fprintf(fp, "Importance: low\n"
+ case PRIORITY_LOW: g_string_sprintfa(header, "Importance: low\n"
"X-Priority: 4 (Low)\n");
break;
- case PRIORITY_LOWEST: fprintf(fp, "Importance: low\n"
+ case PRIORITY_LOWEST: g_string_sprintfa(header, "Importance: low\n"
"X-Priority: 5 (Lowest)\n");
break;
default: debug_print("compose: priority unknown : %d\n",
compose->account->name,
strlen("Disposition-Notification-To: "),
TRUE);
- fprintf(fp, "Disposition-Notification-To: %s <%s>\n", buf, compose->account->address);
+ g_string_sprintfa(header, "Disposition-Notification-To: %s <%s>\n", buf, compose->account->address);
} else
- fprintf(fp, "Disposition-Notification-To: %s\n", compose->account->address);
+ g_string_sprintfa(header, "Disposition-Notification-To: %s\n", compose->account->address);
}
}
string++;
}
if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
- fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
+ g_string_sprintfa(header, "%s %s\n", headername_wcolon, headervalue);
g_free(headername);
g_free(headername_wcolon);
}
/* separator between header and body */
- fputs("\n", fp);
+ g_string_sprintfa(header, "\n");
- return 0;
+ str = header->str;
+ g_string_free(header, FALSE);
+
+ return str;
}
#undef IS_IN_CUSTOM_HEADER
static void compose_convert_header(gchar *dest, gint len, gchar *src,
gint header_len, gboolean addr_field)
{
+ gchar *tmpstr = NULL;
+
g_return_if_fail(src != NULL);
g_return_if_fail(dest != NULL);
if (len < 1) return;
- subst_char(src, '\n', ' ');
- subst_char(src, '\r', ' ');
- g_strchomp(src);
+ tmpstr = g_strdup(src);
+
+ subst_char(tmpstr, '\n', ' ');
+ subst_char(tmpstr, '\r', ' ');
+ g_strchomp(tmpstr);
- conv_encode_header(dest, len, src, header_len, addr_field);
+ conv_encode_header(dest, len, tmpstr, header_len, addr_field);
+ g_free(tmpstr);
}
static void compose_generate_msgid(gchar *buf, gint len)
if (header)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
+ g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_before_cb), compose);
+ g_signal_connect_after(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+
/* Entry field */
entry = gtk_entry_new();
gtk_widget_show(entry);
gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
- gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_cb), headerentry);
- gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
- gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
+ g_signal_connect(G_OBJECT(entry), "key-press-event",
+ G_CALLBACK(compose_headerentry_key_press_event_cb),
+ headerentry);
+ g_signal_connect(G_OBJECT(entry), "changed",
+ G_CALLBACK(compose_headerentry_changed_cb),
+ headerentry);
+ g_signal_connect(G_OBJECT(entry), "activate",
+ G_CALLBACK(text_activated), compose);
g_signal_connect(G_OBJECT(entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_before_cb), compose);
+ g_signal_connect_after(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
-
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
gtk_widget_set_size_request(attach_scrwin, -1, 80);
attach_clist = gtk_clist_new_with_titles(N_ATTACH_COLS, titles);
if (account_get_special_folder(compose->account, F_OUTBOX)) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
}
- gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
- GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+ g_signal_connect(G_OBJECT(savemsg_checkbtn), "toggled",
+ G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
savemsg_entry = gtk_entry_new();
gtk_widget_show(savemsg_entry);
gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
g_signal_connect(G_OBJECT(savemsg_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_before_cb), compose);
+ g_signal_connect_after(G_OBJECT(savemsg_entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
if (account_get_special_folder(compose->account, F_OUTBOX)) {
folderidentifier = folder_item_get_identifier(account_get_special_folder
}
savemsg_select = gtk_button_new_with_label (_("Select ..."));
- gtk_widget_show (savemsg_select);
+ gtk_widget_show(savemsg_select);
gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
- gtk_signal_connect (GTK_OBJECT (savemsg_select), "clicked",
- GTK_SIGNAL_FUNC (compose_savemsg_select_cb),
- compose);
+ g_signal_connect(G_OBJECT(savemsg_select), "clicked",
+ G_CALLBACK(compose_savemsg_select_cb),
+ compose);
rowcount++;
compose->account = account;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
- gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
if (!geometry.max_width) {
geometry.max_width = gdk_screen_width();
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MAX_SIZE);
+ gtk_widget_set_uposition(window, prefs_common.compose_x,
+ prefs_common.compose_y);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(compose_delete_cb), compose);
subject_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
- gtk_signal_connect(GTK_OBJECT(subject_entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
+ g_signal_connect(G_OBJECT(subject_entry), "activate",
+ G_CALLBACK(text_activated), compose);
g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_before_cb), compose);
+ g_signal_connect_after(G_OBJECT(subject_entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(subject_entry);
compose->subject_entry = subject_entry;
/* text widget */
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
-#warning FIXME_GTK2
- /* GTK_STEXT(text)->default_tab_width = 8; */
-
-#warning FIXME_GTK2
-#if 0
- if (prefs_common.block_cursor) {
- GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
- }
-#endif
-#warning FIXME_GTK2
-#if 0
- if (prefs_common.smart_wrapping) {
- gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
- gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
- }
-#else
- if (prefs_common.smart_wrapping) {
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
- }
-#endif
-
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
- g_signal_connect(G_OBJECT(text), "activate",
- G_CALLBACK(text_activated), compose);
-#endif /* FIXME_GTK2 */
-
g_signal_connect_after(G_OBJECT(text), "size_allocate",
G_CALLBACK(compose_edit_size_alloc),
ruler);
style = gtk_widget_get_style(text);
- /* workaround for the slow down of GtkSText when using Pixmap theme */
-#warning FIXME_GTK2
-#if 0 /* FIXME_GTK2 */
- if (style->engine) {
- GtkThemeEngine *engine;
-
- engine = style->engine;
- style->engine = NULL;
- new_style = gtk_style_copy(style);
- style->engine = engine;
- } else
-#endif /* FIXME_GTK2 */
- new_style = gtk_style_copy(style);
+ new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
PangoFontDescription *font_desc;
}
#endif
- action_update_compose_menu(ifactory, compose);
-
-
undostruct = undo_init(text);
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
menubar);
compose->msgid = NULL;
compose->boundary = NULL;
+ compose->autowrap = prefs_common.autowrap;
+
#if USE_GPGME
compose->use_signing = FALSE;
compose->use_encryption = FALSE;
compose->exteditor_pid = -1;
compose->exteditor_readdes = -1;
compose->exteditor_tag = -1;
+ compose->draft_timeout_tag = -1;
#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", FALSE);
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.use_alternate,
- GTK_TEXT_VIEW(text));
+ GTK_TEXT_VIEW(text),
+ GTK_WINDOW(compose->window));
if (!gtkaspell) {
alertpanel_error(_("Spell checker could not "
"be started.\n%s"),
}
}
}
+ compose->gtkaspell = gtkaspell;
#endif
compose_select_account(compose, account, TRUE);
-#if USE_ASPELL
- compose->gtkaspell = gtkaspell;
-#endif
-
+ menu_set_active(ifactory, "/Edit/Auto wrapping", prefs_common.autowrap);
+ menu_set_active(ifactory, "/View/Ruler", prefs_common.show_ruler);
if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
- if (account->set_autobcc)
+ if (account->set_autobcc && account->auto_bcc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
addressbook_set_target_compose(compose);
- action_update_compose_menu(ifactory, compose);
if (mode != COMPOSE_REDIRECT)
compose_set_template_menu(compose);
/* Priority */
compose->priority = PRIORITY_NORMAL;
compose_update_priority_menu_item(compose);
-
+
+ /* Actions menu */
+ compose_update_actions_menu(compose);
+
#if USE_GPGME
activate_gnupg_mode(compose, account);
#endif
gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->tmpl_menu), menu);
}
+void compose_update_actions_menu(Compose *compose)
+{
+ GtkItemFactory *ifactory;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ action_update_compose_menu(ifactory, "/Tools/Actions", compose);
+}
+
void compose_reflect_prefs_all(void)
{
GList *cur;
pid_t pid;
gint pipe_fds[2];
- tmp = g_strdup_printf("%s%ctmpmsg.%08x", get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ tmp = g_strdup_printf("%s%ctmpmsg.%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, compose);
if (pipe(pipe_fds) < 0) {
perror("pipe");
menu_set_sensitive(ifactory, "/Message/Send", sensitive);
menu_set_sensitive(ifactory, "/Message/Send later", sensitive);
- menu_set_sensitive(ifactory, "/Message/Save to draft folder",
- sensitive);
menu_set_sensitive(ifactory, "/File/Insert file", sensitive);
menu_set_sensitive(ifactory, "/File/Insert signature", sensitive);
menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", sensitive);
gtk_widget_set_sensitive(compose->toolbar->insert_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
}
/**
g_return_if_fail(widget != NULL);
- debug_print("Set_undo. UNDO:%i REDO:%i\n", undo_state, redo_state);
-
ifactory = gtk_item_factory_from_widget(widget);
switch (undo_state) {
case UNDO_STATE_TRUE:
if (!undostruct->undo_state) {
- debug_print ("Set_undo - Testpoint\n");
undostruct->undo_state = TRUE;
menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
}
Compose *compose = (Compose *)data;
PrefsAccount *ac;
+ gchar *folderidentifier;
ac = account_find_from_id(
GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
if (ac != compose->account)
compose_select_account(compose, ac, FALSE);
+
+ /* Set message save folder */
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+ }
+ g_signal_connect(G_OBJECT(compose->savemsg_checkbtn), "toggled",
+ G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
+
+ gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
+ folderidentifier = folder_item_get_identifier(account_get_special_folder
+ (compose->account, F_OUTBOX));
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
}
static void attach_selected(GtkCList *clist, gint row, gint column,
static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
- gint val;
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
return;
- compose_allow_user_actions (compose, FALSE);
- compose->sending = TRUE;
- val = compose_send(compose);
- compose_allow_user_actions (compose, TRUE);
- compose->sending = FALSE;
+ if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
+ gtk_timeout_remove(compose->draft_timeout_tag);
+ compose->draft_timeout_tag = -1;
+ }
- if (val == 0) gtk_widget_destroy(compose->window);
+ compose_send(compose);
}
static void compose_send_later_cb(gpointer data, guint action,
lock = TRUE;
- tmp = g_strdup_printf("%s%cdraft.%08x", get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ tmp = g_strdup_printf("%s%cdraft.%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, compose);
if (compose_write_to_file(compose, tmp, TRUE) < 0) {
g_free(tmp);
if (newmsginfo) {
procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+ if (compose_use_attach(compose))
+ procmsg_msginfo_set_flags(newmsginfo, 0, MSG_HAS_ATTACHMENT);
procmsg_msginfo_free(newmsginfo);
}
if (compose->redirect_filename != NULL)
return;
- file_list = filesel_select_multiple_files(_("Select file"), NULL);
+ file_list = filesel_select_multiple_files_open(_("Select file"));
if (file_list) {
GList *tmp;
Compose *compose = (Compose *)data;
GList *file_list;
- file_list = filesel_select_multiple_files(_("Select file"), NULL);
+ file_list = filesel_select_multiple_files_open(_("Select file"));
if (file_list) {
GList *tmp;
for ( tmp = file_list; tmp; tmp = tmp->next) {
gchar *file = (gchar *) tmp->data;
gchar *filedup = g_strdup(file);
- gchar *shortfile;
+ const gchar *shortfile = g_basename(filedup);
ComposeInsertResult res;
res = compose_insert_file(compose, file);
- shortfile = g_basename(filedup);
if (res == COMPOSE_INSERT_READ_ERROR) {
alertpanel_error(_("File '%s' could not be read."), shortfile);
} else if (res == COMPOSE_INSERT_INVALID_CHARACTER) {
static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
+ gint x, y;
Compose *compose = (Compose *)data;
+
+ gtkut_widget_get_uposition(widget, &x, &y);
+ prefs_common.compose_x = x;
+ prefs_common.compose_y = y;
+
if (compose->sending)
return TRUE;
compose_close_cb(compose, 0, NULL);
{
Compose *compose = (Compose *)data;
AlertValue val;
-
+
if (compose->exteditor_tag != -1) {
if (!compose_ext_editor_kill(compose))
return;
* after the gtk_editable_paste_clipboard) know that
* text is to be inserted as a quotation. implemented
* by using a simple refcount... */
- gint paste_as_quotation = GPOINTER_TO_INT(gtk_object_get_data(
- GTK_OBJECT(compose->focused_editable),
+ gint paste_as_quotation = GPOINTER_TO_INT(g_object_get_data(
+ G_OBJECT(compose->focused_editable),
"paste_as_quotation"));
- gtk_object_set_data(GTK_OBJECT(compose->focused_editable),
+ g_object_set_data(G_OBJECT(compose->focused_editable),
"paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation + 1));
entry_paste_clipboard(compose->focused_editable);
}
}
-static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
+static gchar *cliptext = NULL;
+
+static gboolean compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
+{
+ gchar *str = NULL;
+ GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+ if (cliptext)
+ g_free(cliptext);
+ if (gtk_clipboard_wait_is_text_available(clip))
+ cliptext = gtk_clipboard_wait_for_text(clip);
+
+ return FALSE;
+}
+
+static gboolean compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
{
+ gchar *str = NULL;
+ GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+
+ if (GTK_IS_EDITABLE(widget)) {
+ str = gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
+ gtk_editable_set_position(GTK_EDITABLE(widget),
+ strlen(str));
+ g_free(str);
+ }
+ if (cliptext)
+ gtk_clipboard_set_text(clip, cliptext, -1);
+
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
+
+ return TRUE;
}
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
}
}
+static void compose_toggle_autowrap_cb(gpointer data, guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *)data;
+ compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
+ if (compose->autowrap)
+ compose_wrap_line_all_full(compose, TRUE);
+}
+
#if 0 /* NEW COMPOSE GUI */
static void compose_toggle_to_cb(gpointer data, guint action,
GtkWidget *widget)
/* Override default next focus, and give it to subject_entry
* instead of notebook tabs
*/
- gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event");
+ g_signal_stop_emission_by_name(G_OBJECT(entry), "key-press-event");
gtk_widget_grab_focus(headerentry->compose->subject_entry);
return TRUE;
}
headerentry);
compose_create_header_entry(headerentry->compose);
- gtk_signal_disconnect_by_data
- (GTK_OBJECT(entry), headerentry);
+ g_signal_handlers_disconnect_matched
+ (G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, headerentry);
/* Automatically scroll down */
compose_show_first_last_header(headerentry->compose, FALSE);
if (prefs_common.autosave &&
gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0)
- gtk_timeout_add(500, (GtkFunction) compose_defer_auto_save_draft, compose);
+ compose->draft_timeout_tag = gtk_timeout_add
+ (500, (GtkFunction) compose_defer_auto_save_draft, compose);
}
static gint compose_defer_auto_save_draft(Compose *compose)
{
+ compose->draft_timeout_tag = -1;
compose_draft_cb((gpointer)compose, 2, NULL);
return FALSE;
}
if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
return FALSE;
+ if (compose->exteditor_tag != -1)
+ return FALSE;
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
list = gtk_accel_groups_from_object(G_OBJECT(send_menu));
}
#endif
+/*!
+ *\brief Guess originating forward account from MsgInfo and several
+ * "common preference" settings. Return NULL if no guess.
+ */
+static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo)
+{
+ PrefsAccount *account = NULL;
+
+ g_return_val_if_fail(msginfo, NULL);
+ g_return_val_if_fail(msginfo->folder, NULL);
+ g_return_val_if_fail(msginfo->folder->prefs, NULL);
+
+ if (msginfo->folder->prefs->enable_default_account)
+ account = account_find_from_id(msginfo->folder->prefs->default_account);
+
+ if (!account)
+ account = msginfo->folder->folder->account;
+
+ if (!account && msginfo->to && prefs_common.forward_account_autosel) {
+ gchar *to;
+ Xstrdup_a(to, msginfo->to, return NULL);
+ extract_address(to);
+ account = account_find_from_address(to);
+ }
+
+ if (!account && prefs_common.forward_account_autosel) {
+ gchar cc[BUFFSIZE];
+ if (!procheader_get_header_from_msginfo
+ (msginfo, cc,sizeof cc , "CC:")) { /* Found a CC header */
+ extract_address(cc);
+ account = account_find_from_address(cc);
+ }
+ }
+
+ return account;
+}
+
+/**
+ * Add entry field for each address in list.
+ * \param compose E-Mail composition object.
+ * \param listAddress List of (formatted) E-Mail addresses.
+ */
+static void compose_add_field_list( Compose *compose, GList *listAddress ) {
+ GList *node;
+ gchar *addr;
+ node = listAddress;
+ while( node ) {
+ addr = ( gchar * ) node->data;
+ compose_entry_append( compose, addr, COMPOSE_TO );
+ node = g_list_next( node );
+ }
+}
+
+/*
+ * End of Source.
+ */
+