#include "foldersel.h"
#include "toolbar.h"
-#if USE_GPGME
-# include "rfc2015.h"
-#endif
-
typedef enum
{
COL_MIMETYPE = 0,
COMPOSE_INSERT_NO_FILE
} ComposeInsertResult;
+typedef enum
+{
+ COMPOSE_QUIT_EDITING,
+ COMPOSE_KEEP_EDITING,
+ COMPOSE_AUTO_SAVE
+} ComposeDraftAction;
+
+typedef enum
+{
+ COMPOSE_WRITE_FOR_SEND,
+ COMPOSE_WRITE_FOR_STORE
+} ComposeWriteType;
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
static gboolean compose_check_entries (Compose *compose,
gboolean check_subject);
static gint compose_write_to_file (Compose *compose,
- const gchar *file,
- gboolean is_draft);
+ FILE *fp,
+ gint action);
static gint compose_write_body_to_file (Compose *compose,
const gchar *file);
static gint compose_remove_reedit_target (Compose *compose);
gint *msgnum,
FolderItem **item,
gboolean check_subject);
-static void compose_write_attach (Compose *compose,
- FILE *fp);
-static gint compose_write_headers (Compose *compose,
- FILE *fp,
- const gchar *charset,
- EncodingType encoding,
- gboolean is_draft);
+static void compose_add_attachments (Compose *compose,
+ MimeInfo *parent);
+static gchar *compose_get_header (Compose *compose);
static void compose_convert_header (gchar *dest,
gint len,
gchar *src,
gint header_len,
gboolean addr_field);
-static void compose_generate_msgid (gchar *buf,
- gint len);
static void compose_attach_info_free (AttachInfo *ainfo);
static void compose_attach_remove_selected (Compose *compose);
static void compose_toggle_ruler_cb (gpointer data,
guint action,
GtkWidget *widget);
-#if USE_GPGME
static void compose_toggle_sign_cb (gpointer data,
guint action,
GtkWidget *widget);
static void compose_toggle_encrypt_cb (gpointer data,
guint action,
GtkWidget *widget);
-static void compose_set_gnupg_mode_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_update_gnupg_mode_menu_item(Compose * compose);
-static void activate_gnupg_mode (Compose *compose,
- PrefsAccount *account);
-#endif
+static void compose_set_privacy_system_cb(gpointer data,
+ guint action,
+ GtkWidget *widget);
+static void compose_update_privacy_system_menu_item(Compose * compose);
+static void activate_privacy_system (Compose *compose,
+ PrefsAccount *account);
+static void compose_use_signing(Compose *compose, gboolean use_signing);
+static void compose_use_encryption(Compose *compose, gboolean use_encryption);
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget);
static void compose_toggle_remove_refs_cb(gpointer data, guint action,
gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
-static gboolean compose_headerentry_button_pressed (GtkWidget *entry,
- GdkEventButton *event,
- gpointer data);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
static GtkItemFactoryEntry compose_entries[] =
{
- {N_("/_File"), NULL, NULL, 0, "<Branch>"},
- {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},
- {N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Close"), "<control>W", compose_close_cb, 0, NULL},
+ {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/_Send"), "<control>Return",
+ 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/_Attach file"), "<control>M", compose_attach_cb, 0, NULL},
+ {N_("/_Message/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
+ {N_("/_Message/Insert si_gnature"), "<control>G", compose_insert_sig_cb, 0, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Save"),
+ "<control>S", compose_draft_cb, COMPOSE_KEEP_EDITING, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Close"), "<control>W", compose_close_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Undo"), "<control>Z", compose_undo_cb, 0, NULL},
{N_("/_Spelling/_Spelling Configuration"),
NULL, NULL, 0, "<Branch>"},
#endif
-#if 0 /* NEW COMPOSE GUI */
- {N_("/_View"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
- {N_("/_View/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
- {N_("/_View/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
- {N_("/_View/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/R_uler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Attachment"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
-#endif
- {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Send"), "<control>Return",
- 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/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Attach"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
-#endif
-#if USE_GPGME
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
- {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>"},
- {N_("/_Message/_Priority"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/Priority/_Highest"), NULL, compose_set_priority_cb, PRIORITY_HIGHEST, "<RadioItem>"},
- {N_("/_Message/Priority/Hi_gh"), NULL, compose_set_priority_cb, PRIORITY_HIGH, "/Message/Priority/Highest"},
- {N_("/_Message/Priority/_Normal"), NULL, compose_set_priority_cb, PRIORITY_NORMAL, "/Message/Priority/Highest"},
- {N_("/_Message/Priority/Lo_w"), NULL, compose_set_priority_cb, PRIORITY_LOW, "/Message/Priority/Highest"},
- {N_("/_Message/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Message/Priority/Highest"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
- {N_("/_Message/Remo_ve references"), NULL, compose_toggle_remove_refs_cb, 0, "<ToggleItem>"},
+ {N_("/_Options"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Privacy System/None"), NULL, compose_set_privacy_system_cb, 0, "<RadioItem>"},
+ {N_("/_Options/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
+ {N_("/_Options/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
+ {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/_Priority"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Priority/_Highest"), NULL, compose_set_priority_cb, PRIORITY_HIGHEST, "<RadioItem>"},
+ {N_("/_Options/Priority/Hi_gh"), NULL, compose_set_priority_cb, PRIORITY_HIGH, "/Options/Priority/Highest"},
+ {N_("/_Options/Priority/_Normal"), NULL, compose_set_priority_cb, PRIORITY_NORMAL, "/Options/Priority/Highest"},
+ {N_("/_Options/Priority/Lo_w"), NULL, compose_set_priority_cb, PRIORITY_LOW, "/Options/Priority/Highest"},
+ {N_("/_Options/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Options/Priority/Highest"},
+ {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
+ {N_("/_Options/Remo_ve references"), NULL, compose_toggle_remove_refs_cb, 0, "<ToggleItem>"},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
{N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
compose = compose_create(account, COMPOSE_REPLY);
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_active(ifactory, "/Message/Remove references", FALSE);
- menu_set_sensitive(ifactory, "/Message/Remove references", TRUE);
+ menu_set_active(ifactory, "/Options/Remove references", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Remove references", TRUE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->replyinfo)
GtkTextIter iter;
FILE *fp;
gchar buf[BUFFSIZE];
+ gboolean use_signing = FALSE;
+ gboolean use_encryption = FALSE;
+ gchar *privacy_system = NULL;
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);
}
+ 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-Privacy-System:")) {
+ privacy_system = g_strdup(&queueheader_buf[strlen("X-Sylpheed-Privacy-System:")]);
+ }
+ 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);
+ compose->privacy_system = privacy_system;
+ compose_use_signing(compose, use_signing);
+ compose_use_encryption(compose, use_encryption);
compose->targetinfo = procmsg_msginfo_copy(msginfo);
if (msginfo->folder->stype == F_QUEUE
g_signal_handlers_block_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
+
+ g_signal_handlers_block_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(text_inserted),
+ compose);
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning("Can't get text part\n");
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
gtk_text_buffer_insert(textbuf, &iter, buf, -1);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
}
fclose(fp);
}
compose_attach_parts(compose, msginfo);
+ g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(text_inserted),
+ compose);
g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
menu_set_sensitive(ifactory, "/Property...", FALSE);
ifactory = gtk_item_factory_from_widget(compose->menubar);
- 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, "/Message/Save", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Insert file", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Attach file", FALSE);
+ menu_set_sensitive(ifactory, "/Message/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);
- menu_set_sensitive(ifactory, "/Message/Mode/MIME", FALSE);
- menu_set_sensitive(ifactory, "/Message/Mode/Inline", FALSE);
-#endif
- menu_set_sensitive(ifactory, "/Message/Priority", FALSE);
- menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Sign", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Encrypt", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Priority", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Request Return Receipt", FALSE);
menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
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)) {
+ !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
gtk_widget_ensure_style(GTK_WIDGET(entry));
if (!bold_style) {
PangoFontDescription *font_desc = NULL;
compose_send_later_cb(compose, 0, NULL);
break;
case A_DRAFT:
- compose_draft_cb(compose, 0, NULL);
+ compose_draft_cb(compose, COMPOSE_QUIT_EDITING, NULL);
break;
case A_INSERT:
compose_insert_file_cb(compose, 0, NULL);
for (cur = ref_id_list; cur != NULL; cur = cur->next) {
if (new_ref->len > 0)
g_string_append(new_ref, "\n\t");
- g_string_sprintfa(new_ref, "<%s>", (gchar *)cur->data);
+ g_string_append_printf(new_ref, "<%s>", (gchar *)cur->data);
}
slist_free_strings(ref_id_list);
SET_ADDRESS(COMPOSE_FOLLOWUPTO, compose->followup_to);
compose_update_priority_menu_item(compose);
-#if USE_GPGME
- compose_update_gnupg_mode_menu_item(compose);
-#endif
+ compose_update_privacy_system_menu_item(compose);
compose_show_first_last_header(compose, TRUE);
-
}
#undef SET_ENTRY
while (fgets(buf, sizeof(buf), fp) != NULL) {
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;
FILE *fp;
off_t size;
gint row;
+ gchar *name;
if (!is_file_exist(file)) {
g_warning("File %s doesn't exist\n", file);
if (content_type) {
ainfo->content_type = g_strdup(content_type);
- if (!strcasecmp(content_type, "message/rfc822")) {
+ if (!g_ascii_strcasecmp(content_type, "message/rfc822")) {
MsgInfo *msginfo;
MsgFlags flags = {0, 0};
- const gchar *name;
- if (procmime_get_encoding_for_file(file) == ENC_7BIT)
+ if (procmime_get_encoding_for_text_file(file) == ENC_7BIT)
ainfo->encoding = ENC_7BIT;
else
ainfo->encoding = ENC_8BIT;
if (msginfo && msginfo->subject)
name = msginfo->subject;
else
- name = g_basename(filename ? filename : file);
+ name = g_path_get_basename(filename ? filename : file);
ainfo->name = g_strdup_printf(_("Message: %s"), name);
procmsg_msginfo_free(msginfo);
} else {
- if (!g_strncasecmp(content_type, "text", 4))
- ainfo->encoding =
- procmime_get_encoding_for_file(file);
+ if (!g_ascii_strncasecmp(content_type, "text", 4))
+ ainfo->encoding = procmime_get_encoding_for_text_file(file);
else
ainfo->encoding = ENC_BASE64;
- ainfo->name = g_strdup
- (g_basename(filename ? filename : file));
+ name = g_path_get_basename(filename ? filename : file);
+ ainfo->name = g_strdup(name);
}
+ g_free(name);
} else {
ainfo->content_type = procmime_get_mime_type(file);
if (!ainfo->content_type) {
ainfo->content_type =
g_strdup("application/octet-stream");
ainfo->encoding = ENC_BASE64;
- } else if (!g_strncasecmp(ainfo->content_type, "text", 4))
- ainfo->encoding = procmime_get_encoding_for_file(file);
+ } else if (!g_ascii_strncasecmp(ainfo->content_type, "text", 4))
+ ainfo->encoding =
+ procmime_get_encoding_for_text_file(file);
else
ainfo->encoding = ENC_BASE64;
- ainfo->name = g_strdup(g_basename(filename ? filename : file));
+ name = g_path_get_basename(filename ? filename : file);
+ ainfo->name = g_strdup(name);
+ g_free(name);
}
+
+ if (!strcmp(ainfo->content_type, "unknown")) {
+ g_free(ainfo->content_type);
+ ainfo->content_type = g_strdup("application/octet-stream");
+ }
+
ainfo->size = size;
text[COL_MIMETYPE] = ainfo->content_type;
gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
}
-#ifdef USE_GPGME
static void compose_use_signing(Compose *compose, gboolean use_signing)
{
GtkItemFactory *ifactory;
compose->use_signing = use_signing;
ifactory = gtk_item_factory_from_widget(compose->menubar);
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Sign");
-
+ (ifactory, "/Options/Sign");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
use_signing);
- compose_update_gnupg_mode_menu_item(compose);
}
-#endif /* USE_GPGME */
+
+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, "/Options/Encrypt");
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ use_encryption);
+}
#define NEXT_PART_NOT_CHILD(info) \
{ \
debug_print("First text part found\n");
} else if (compose->mode == COMPOSE_REEDIT &&
child->type == MIMETYPE_APPLICATION &&
- !strcasecmp(child->subtype, "pgp-encrypted")) {
+ !g_ascii_strcasecmp(child->subtype, "pgp-encrypted")) {
AlertValue val;
val = alertpanel(_("Encrypted message"),
_("Cannot re-edit an encrypted message. \n"
continue;
}
- if ((compose->mode == COMPOSE_REEDIT ||
- compose->mode == COMPOSE_FORWARD_INLINE ||
- compose->mode == COMPOSE_FORWARD ) &&
- (child->type == MIMETYPE_APPLICATION) &&
- !strcmp(child->subtype, "pgp-signature")) {
-#ifdef USE_GPGME
- if (compose->mode == COMPOSE_REEDIT) {
- compose->gnupg_mode = GNUPG_MODE_DETACH;
- compose_use_signing(compose, TRUE);
- }
-#endif
- child = procmime_mimeinfo_next(child);
- continue;
- }
outfile = procmime_get_tmp_file_name(child);
if (procmime_get_part(outfile, child) < 0)
g_warning("Can't get the part of multipart message.");
else {
gchar *content_type;
- content_type = g_strdup_printf("%s/%s", procmime_get_type_str(child->type), child->subtype);
+ content_type = procmime_get_content_type_str(child->type, child->subtype);
partname = procmime_mimeinfo_get_parameter(child, "name");
if (partname == NULL)
partname = "";
#endif
-#if USE_GPGME
if (account->default_sign)
- menu_set_active(ifactory, "/Message/Sign", TRUE);
+ menu_set_active(ifactory, "/Options/Sign", TRUE);
else
- menu_set_active(ifactory, "/Message/Sign", FALSE);
+ menu_set_active(ifactory, "/Options/Sign", FALSE);
if (account->default_encrypt)
- menu_set_active(ifactory, "/Message/Encrypt", TRUE);
+ menu_set_active(ifactory, "/Options/Encrypt", TRUE);
else
- menu_set_active(ifactory, "/Message/Encrypt", FALSE);
+ menu_set_active(ifactory, "/Options/Encrypt", FALSE);
- activate_gnupg_mode(compose, account);
-#endif /* USE_GPGME */
+ activate_privacy_system(compose, account);
if (!init && compose->mode != COMPOSE_REDIRECT)
compose_insert_sig(compose, TRUE);
goto bail;
}
- compose->sending = FALSE;
- gtk_widget_destroy(compose->window);
- /* No more compose access in the normal codepath after this point! */
+
+ 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."));
+ 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);
+ 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);
+ } else {
+ 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_allow_user_actions (compose, TRUE);
+ compose->sending = FALSE;
+ }
+ return -1;
+ }
return 0;
return -1;
}
-#if 0 /* compose restructure */
-gint compose_send(Compose *compose)
-{
- gchar tmp[MAXPATHLEN + 1];
- gint ok = 0;
- static gboolean lock = FALSE;
-
- if (lock) return 1;
-
- g_return_val_if_fail(compose->account != NULL, -1);
-
- lock = TRUE;
-
- if (compose_check_entries(compose, TRUE) == FALSE) {
- lock = FALSE;
- return 1;
- }
-
- /* write to temporary file */
- 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);
-
- if (compose_write_to_file(compose, tmp, FALSE) < 0) {
- lock = FALSE;
- return -1;
- }
-
- if (!compose->to_list && !compose->newsgroup_list) {
- g_warning("can't get recipient list.");
- unlink(tmp);
- lock = FALSE;
- return -1;
- }
-
- if (compose->to_list) {
- PrefsAccount *ac;
-
-#if 0 /* NEW COMPOSE GUI */
- if (compose->account->protocol != A_NNTP)
- ac = compose->account;
- else {
- ac = account_find_from_address(compose->account->address);
- if (!ac) {
- if (cur_account && cur_account->protocol != A_NNTP)
- ac = cur_account;
- else
- ac = account_get_default();
- }
- if (!ac || ac->protocol == A_NNTP) {
- alertpanel_error(_("Account for sending mail is not specified.\n"
- "Please select a mail account before sending."));
- unlink(tmp);
- lock = FALSE;
- return -1;
- }
- }
-#endif
- ac = compose->account;
-
- ok = send_message(tmp, ac, compose->to_list);
- }
-
- if (ok == 0 && compose->newsgroup_list) {
- ok = news_post(FOLDER(compose->account->folder), tmp);
- if (ok < 0) {
- alertpanel_error(_("Error occurred while posting the message to %s ."),
- compose->account->nntp_server);
- unlink(tmp);
- lock = FALSE;
- return -1;
- }
- }
-
- if (ok == 0) {
- if (compose->mode == COMPOSE_REEDIT) {
- compose_remove_reedit_target(compose);
- }
- /* save message to outbox */
- if (prefs_common.savemsg) {
- FolderItem *outbox;
-
- outbox = account_get_special_folder
- (compose->account, F_OUTBOX);
- if (procmsg_save_to_outbox(outbox, tmp, FALSE) < 0)
- alertpanel_error
- (_("Can't save the message to Sent."));
- }
- }
-
- unlink(tmp);
- lock = FALSE;
- return ok;
-}
-#endif
-
static gboolean compose_use_attach(Compose *compose)
{
return gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL;
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if (g_strcasecmp(headerentryname, cc_hdr) == 0
- || g_strcasecmp(headerentryname, to_hdr) == 0) {
+ if (g_utf8_collate(headerentryname, cc_hdr) == 0
+ || g_utf8_collate(headerentryname, to_hdr) == 0) {
const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
compose_convert_header
(buf, sizeof(buf), str,
strlen("Resent-To") + 2, TRUE);
- if (g_strcasecmp(headerentryname, to_hdr) == 0) {
+ if (g_utf8_collate(headerentryname, to_hdr) == 0) {
if (first_to_address) {
fprintf(fp, "Resent-To: ");
first_to_address = FALSE;
fprintf(fp, ",");
}
}
- if (g_strcasecmp(headerentryname, cc_hdr) == 0) {
+ if (g_utf8_collate(headerentryname, cc_hdr) == 0) {
if (first_cc_address) {
fprintf(fp, "\n");
fprintf(fp, "Resent-Cc: ");
/* Resent-Message-ID */
if (compose->account->gen_msgid) {
- compose_generate_msgid(buf, sizeof(buf));
+ generate_msgid(buf, sizeof(buf));
fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
return 0;
}
-static gint compose_redirect_write_to_file(Compose *compose, const gchar *file)
+static gint compose_redirect_write_to_file(Compose *compose, FILE *fdest)
{
FILE *fp;
- FILE *fdest;
size_t len;
gchar buf[BUFFSIZE];
if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- return -1;
- }
-
- if ((fdest = fopen(file, "wb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- fclose(fp);
+ FILE_OP_ERROR(compose->redirect_filename, "fopen");
return -1;
}
- /* chmod for security */
- if (change_file_mode_rw(fdest, file) < 0) {
- FILE_OP_ERROR(file, "chmod");
- g_warning("can't change file mode\n");
- }
-
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 ||
- g_strncasecmp(buf, "Delivered-To:",
- strlen("Delivered-To:")) == 0 ||
- g_strncasecmp(buf, "Received:",
- strlen("Received:")) == 0 ||
- g_strncasecmp(buf, "Subject:",
- strlen("Subject:")) == 0 ||
- g_strncasecmp(buf, "X-UIDL:",
- strlen("X-UIDL:")) == 0)
+ if (g_ascii_strncasecmp(buf, "Return-Path:",
+ strlen("Return-Path:")) == 0 ||
+ g_ascii_strncasecmp(buf, "Delivered-To:",
+ strlen("Delivered-To:")) == 0 ||
+ g_ascii_strncasecmp(buf, "Received:",
+ strlen("Received:")) == 0 ||
+ g_ascii_strncasecmp(buf, "Subject:",
+ strlen("Subject:")) == 0 ||
+ g_ascii_strncasecmp(buf, "X-UIDL:",
+ strlen("X-UIDL:")) == 0)
continue;
if (fputs(buf, fdest) == -1)
goto error;
if (!prefs_common.redirect_keep_from) {
- if (g_strncasecmp(buf, "From:",
+ if (g_ascii_strncasecmp(buf, "From:",
strlen("From:")) == 0) {
fputs(" (by way of ", fdest);
if (compose->account->name
compose_redirect_write_headers(compose, fdest);
while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
- if (fwrite(buf, sizeof(gchar), len, fdest) != len) {
- FILE_OP_ERROR(file, "fwrite");
+ if (fwrite(buf, sizeof(gchar), len, fdest) != len)
goto error;
- }
}
fclose(fp);
- if (fclose(fdest) == EOF) {
- FILE_OP_ERROR(file, "fclose");
- unlink(file);
- return -1;
- }
return 0;
- error:
+error:
fclose(fp);
- fclose(fdest);
- unlink(file);
return -1;
}
-
-#if USE_GPGME
-/* interfaces to rfc2015 to keep out the prefs stuff there.
- * returns 0 on success and -1 on error. */
-static gint compose_create_signers_list(Compose *compose, GSList **pkey_list)
-{
- const gchar *key_id = NULL;
- GSList *key_list;
-
- switch (compose->account->sign_key) {
- case SIGN_KEY_DEFAULT:
- *pkey_list = NULL;
- return 0;
- case SIGN_KEY_BY_FROM:
- key_id = compose->account->address;
- break;
- case SIGN_KEY_CUSTOM:
- key_id = compose->account->sign_key_id;
- break;
- default:
- break;
- }
-
- key_list = rfc2015_create_signers_list(key_id);
-
- if (!key_list) {
- alertpanel_error(_("Could not find any key associated with "
- "currently selected key id `%s'."), key_id);
- return -1;
- }
-
- *pkey_list = key_list;
- return 0;
-}
-
-/* clearsign message body text */
-static gint compose_clearsign_text(Compose *compose, gchar **text)
-{
- GSList *key_list;
- gchar *tmp_file;
-
- tmp_file = get_tmp_file();
- if (str_write_to_file(*text, tmp_file) < 0) {
- g_free(tmp_file);
- return -1;
- }
-
- if (compose_create_signers_list(compose, &key_list) < 0 ||
- rfc2015_clearsign(tmp_file, key_list) < 0) {
- unlink(tmp_file);
- g_free(tmp_file);
- return -1;
- }
-
- g_free(*text);
- *text = file_read_to_str(tmp_file);
- unlink(tmp_file);
- g_free(tmp_file);
- if (*text == NULL)
- return -1;
-
- return 0;
-}
-#endif /* USE_GPGME */
-
-static gint compose_write_to_file(Compose *compose, const gchar *file,
- gboolean is_draft)
+static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
{
GtkTextBuffer *buffer;
GtkTextIter start, end;
- FILE *fp;
- size_t len;
gchar *chars;
gchar *buf;
- gchar *canon_buf;
const gchar *out_codeset;
EncodingType encoding;
+ MimeInfo *mimemsg, *mimetext;
- if ((fp = fopen(file, "wb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- return -1;
- }
-
- /* chmod for security */
- if (change_file_mode_rw(fp, file) < 0) {
- FILE_OP_ERROR(file, "chmod");
- g_warning("can't change file mode\n");
- }
+ /* create message MimeInfo */
+ mimemsg = procmime_mimeinfo_new();
+ mimemsg->type = MIMETYPE_MESSAGE;
+ mimemsg->subtype = g_strdup("rfc822");
+ mimemsg->content = MIMECONTENT_MEM;
+ mimemsg->data.mem = compose_get_header(compose);
+ /* Create text part MimeInfo */
/* get all composed text */
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
gtk_text_buffer_get_start_iter(buffer, &start);
const gchar *src_codeset;
out_codeset = conv_get_outgoing_charset_str();
- if (!strcasecmp(out_codeset, CS_US_ASCII))
+ if (!g_ascii_strcasecmp(out_codeset, CS_US_ASCII))
out_codeset = CS_ISO_8859_1;
if (prefs_common.encoding_method == CTE_BASE64)
else
encoding = procmime_get_encoding_for_charset(out_codeset);
-#if USE_GPGME
- if (!is_draft &&
- compose->use_signing && !compose->gnupg_mode &&
- encoding == ENC_8BIT)
- encoding = ENC_BASE64;
-#endif
-
src_codeset = CS_UTF_8;
+ /* if current encoding is US-ASCII, set it the same as
+ outgoing one to prevent code conversion failure */
+ if (!g_ascii_strcasecmp(src_codeset, CS_US_ASCII))
+ src_codeset = out_codeset;
debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
src_codeset, out_codeset, procmime_get_encoding_str(encoding));
- buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
- if (!buf) {
- AlertValue aval = G_ALERTDEFAULT;
- gchar *msg;
+ if (action == COMPOSE_WRITE_FOR_SEND) {
+ buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
+ if (!buf) {
+ AlertValue aval;
+ gchar *msg;
- 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);
+ "%s to %s.\n"
+ "Send it anyway?"), src_codeset, out_codeset);
aval = alertpanel_with_type
(_("Error"), msg, _("Yes"), _("+No"), NULL, NULL, ALERT_ERROR);
g_free(msg);
+
+ if (aval != G_ALERTDEFAULT) {
+ g_free(chars);
+ return -1;
+ } else {
+ buf = chars;
+ out_codeset = src_codeset;
+ chars = NULL;
+ }
}
-
- if (aval != G_ALERTDEFAULT) {
- g_free(chars);
- fclose(fp);
- unlink(file);
- return -1;
- } else {
- buf = chars;
- out_codeset = src_codeset;
- chars = NULL;
- }
+ } else {
+ buf = chars;
+ out_codeset = src_codeset;
+ chars = NULL;
}
}
g_free(chars);
- canon_buf = canonicalize_str(buf);
- g_free(buf);
- buf = canon_buf;
-
-#if USE_GPGME
- if (!is_draft && compose->use_signing && compose->gnupg_mode) {
- if (compose_clearsign_text(compose, &buf) < 0) {
- g_warning("clearsign failed\n");
- fclose(fp);
- unlink(file);
- g_free(buf);
- return -1;
- }
- }
-#endif
-
- /* write headers */
- if (compose_write_headers
- (compose, fp, out_codeset, encoding, is_draft) < 0) {
- g_warning("can't write headers\n");
- fclose(fp);
- /* unlink(file); */
- g_free(buf);
- return -1;
- }
-
+ mimetext = procmime_mimeinfo_new();
+ mimetext->content = MIMECONTENT_MEM;
+ mimetext->data.mem = buf;
+ mimetext->type = MIMETYPE_TEXT;
+ mimetext->subtype = g_strdup("plain");
+ g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
+ g_strdup(out_codeset));
+ if (encoding != ENC_UNKNOWN)
+ procmime_encode_content(mimetext, encoding);
+
+ /* append attachment parts */
if (compose_use_attach(compose)) {
-#if USE_GPGME
- /* This prolog message is ignored by mime software and
- * because it would make our signing/encryption task
- * tougher, we don't emit it in that case */
- if (!compose->use_signing && !compose->use_encryption)
-#endif
- fputs("This is a multi-part message in MIME format.\n", fp);
-
- fprintf(fp, "\n--%s\n", compose->boundary);
- fprintf(fp, "Content-Type: text/plain; charset=%s\n",
- out_codeset);
-#if USE_GPGME
- if (compose->use_signing && !compose->gnupg_mode)
- fprintf(fp, "Content-Disposition: inline\n");
-#endif
- fprintf(fp, "Content-Transfer-Encoding: %s\n",
- procmime_get_encoding_str(encoding));
- fputc('\n', fp);
- }
-
- /* write body */
- len = strlen(buf);
- if (encoding == ENC_BASE64) {
- gchar outbuf[B64_BUFFSIZE];
- gint i, l;
-
- for (i = 0; i < len; i += B64_LINE_SIZE) {
- l = MIN(B64_LINE_SIZE, len - i);
- base64_encode(outbuf, buf + i, l);
- fputs(outbuf, fp);
- fputc('\n', fp);
- }
- } 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 (fwrite(outbuf, sizeof(gchar), outlen, fp) != outlen) {
- FILE_OP_ERROR(file, "fwrite");
- fclose(fp);
- unlink(file);
- g_free(outbuf);
- g_free(buf);
- return -1;
- }
- g_free(outbuf);
- } else if (fwrite(buf, sizeof(gchar), len, fp) != len) {
- FILE_OP_ERROR(file, "fwrite");
- fclose(fp);
- unlink(file);
- g_free(buf);
- return -1;
- }
- g_free(buf);
+ MimeInfo *mimempart;
- if (compose_use_attach(compose))
- compose_write_attach(compose, fp);
-
- if (fclose(fp) == EOF) {
- FILE_OP_ERROR(file, "fclose");
- unlink(file);
- return -1;
- }
+ mimempart = procmime_mimeinfo_new();
+ mimempart->content = MIMECONTENT_EMPTY;
+ mimempart->type = MIMETYPE_MULTIPART;
+ mimempart->subtype = g_strdup("mixed");
+ g_hash_table_insert(mimempart->typeparameters, g_strdup("boundary"),
+ generate_mime_boundary(NULL));
-#if USE_GPGME
- if (is_draft) {
- uncanonicalize_file_replace(file);
- return 0;
- }
+ mimetext->disposition = DISPOSITIONTYPE_INLINE;
- if ((compose->use_signing && !compose->gnupg_mode) ||
- compose->use_encryption) {
- if (canonicalize_file_replace(file) < 0) {
- unlink(file);
- return -1;
- }
- }
+ g_node_append(mimempart->node, mimetext->node);
+ g_node_append(mimemsg->node, mimempart->node);
- if (compose->use_signing && !compose->gnupg_mode) {
- GSList *key_list;
+ compose_add_attachments(compose, mimempart);
+ } else
+ g_node_append(mimemsg->node, mimetext->node);
- if (compose_create_signers_list(compose, &key_list) < 0 ||
- rfc2015_sign(file, key_list) < 0) {
- unlink(file);
- return -1;
- }
- }
- if (compose->use_encryption) {
- if (rfc2015_encrypt(file, compose->to_list,
- compose->gnupg_mode) < 0) {
- unlink(file);
+ /* sign message if sending */
+ if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
+ privacy_system_can_sign(compose->privacy_system))
+ if (!privacy_sign(compose->privacy_system, mimemsg))
return -1;
- }
- }
-#endif /* USE_GPGME */
- uncanonicalize_file_replace(file);
+ procmime_write_mimeinfo(mimemsg, fp);
return 0;
}
static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
{
FolderItem *queue;
- gchar *tmp, *tmp2;
- FILE *fp, *src_fp;
+ gchar *tmp;
+ FILE *fp;
GSList *cur;
- gchar buf[BUFFSIZE];
gint num;
static gboolean lock = FALSE;
PrefsAccount *mailac = NULL, *newsac = NULL;
if (prefs_common.linewrap_at_send)
compose_wrap_line_all(compose);
-
- /* write to temporary file */
- tmp2 = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
- if (compose->redirect_filename != NULL) {
- if (compose_redirect_write_to_file(compose, tmp2) < 0) {
- unlink(tmp2);
- lock = FALSE;
- return -1;
- }
- }
- else {
- if (compose_write_to_file(compose, tmp2, FALSE) < 0) {
- unlink(tmp2);
- lock = FALSE;
- return -1;
- }
- }
-
- /* add queue header */
+ /* write queue header */
tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
if ((fp = fopen(tmp, "wb")) == NULL) {
g_free(tmp);
return -1;
}
- if ((src_fp = fopen(tmp2, "rb")) == NULL) {
- FILE_OP_ERROR(tmp2, "fopen");
- fclose(fp);
- unlink(tmp);
- g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
- return -1;
- }
+
if (change_file_mode_rw(fp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
g_warning("can't change file mode\n");
fprintf(fp, "\n");
}
/* Sylpheed account IDs */
- if (mailac) {
+ if (mailac)
fprintf(fp, "MAID:%d\n", mailac->account_id);
- }
- if (newsac) {
+ if (newsac)
fprintf(fp, "NAID:%d\n", newsac->account_id);
+
+ if (compose->privacy_system != NULL) {
+ fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
+ fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ if (compose->use_encryption) {
+ gchar *encdata;
+
+ encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
+ if (encdata != NULL)
+ fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n",
+ encdata);
+ g_free(encdata);
+ }
}
+
/* Save copy folder */
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
}
fprintf(fp, "\n");
- while (fgets(buf, sizeof(buf), src_fp) != NULL) {
- if (fputs(buf, fp) == EOF) {
- FILE_OP_ERROR(tmp, "fputs");
+ if (compose->redirect_filename != NULL) {
+ if (compose_redirect_write_to_file(compose, fp) < 0) {
+ lock = FALSE;
+ fclose(fp);
+ unlink(tmp);
+ g_free(tmp);
+ return -1;
+ }
+ } else {
+ if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND) < 0) {
+ lock = FALSE;
fclose(fp);
- fclose(src_fp);
unlink(tmp);
g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
return -1;
}
}
- fclose(src_fp);
+
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
unlink(tmp);
g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
return -1;
}
}
unlink(tmp);
g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
return 0;
}
-static void compose_write_attach(Compose *compose, FILE *fp)
+static void compose_add_attachments(Compose *compose, MimeInfo *parent)
{
AttachInfo *ainfo;
GtkCList *clist = GTK_CLIST(compose->attach_clist);
gint row;
- FILE *attach_fp;
- gchar filename[BUFFSIZE];
- gint len;
+ MimeInfo *mimepart;
+ struct stat statbuf;
+ gchar *type, *subtype;
for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
row++) {
- if ((attach_fp = fopen(ainfo->file, "rb")) == NULL) {
- g_warning("Can't open file %s\n", ainfo->file);
- continue;
- }
+ mimepart = procmime_mimeinfo_new();
+ mimepart->content = MIMECONTENT_FILE;
+ mimepart->data.filename = g_strdup(ainfo->file);
+ mimepart->offset = 0;
- fprintf(fp, "\n--%s\n", compose->boundary);
+ stat(ainfo->file, &statbuf);
+ mimepart->length = statbuf.st_size;
- if (!strcmp2(ainfo->content_type, "message/rfc822")) {
- fprintf(fp, "Content-Type: %s\n", ainfo->content_type);
- fprintf(fp, "Content-Disposition: inline\n");
- } else {
- compose_convert_header(filename, sizeof(filename),
- ainfo->name, 12, FALSE);
- fprintf(fp, "Content-Type: %s;\n"
- " name=\"%s\"\n",
- ainfo->content_type, filename);
- fprintf(fp, "Content-Disposition: attachment;\n"
- " filename=\"%s\"\n", filename);
- }
+ type = g_strdup(ainfo->content_type);
- fprintf(fp, "Content-Transfer-Encoding: %s\n\n",
- procmime_get_encoding_str(ainfo->encoding));
-
- if (ainfo->encoding == ENC_BASE64) {
- gchar inbuf[B64_LINE_SIZE], outbuf[B64_BUFFSIZE];
+ if (!strchr(type, '/')) {
+ g_free(type);
+ type = g_strdup("application/octet-stream");
+ }
- while ((len = fread(inbuf, sizeof(gchar),
- B64_LINE_SIZE, attach_fp))
- == B64_LINE_SIZE) {
- base64_encode(outbuf, inbuf, B64_LINE_SIZE);
- fputs(outbuf, fp);
- fputc('\n', fp);
- }
- if (len > 0 && feof(attach_fp)) {
- base64_encode(outbuf, inbuf, len);
- fputs(outbuf, fp);
- fputc('\n', fp);
- }
- } else if (ainfo->encoding == ENC_QUOTED_PRINTABLE) {
- gchar inbuf[BUFFSIZE], outbuf[BUFFSIZE * 4];
+ subtype = strchr(type, '/') + 1;
+ *(subtype - 1) = '\0';
+ mimepart->type = procmime_get_media_type(type);
+ mimepart->subtype = g_strdup(subtype);
+ g_free(type);
- while (fgets(inbuf, sizeof(inbuf), attach_fp) != NULL) {
- qp_encode_line(outbuf, inbuf);
- fputs(outbuf, fp);
- }
+ if (mimepart->type == MIMETYPE_MESSAGE &&
+ !g_ascii_strcasecmp(mimepart->subtype, "rfc822")) {
+ mimepart->disposition = DISPOSITIONTYPE_INLINE;
} else {
- gchar buf[BUFFSIZE];
-
- while (fgets(buf, sizeof(buf), attach_fp) != NULL) {
- strcrchomp(buf);
- fputs(buf, fp);
- }
+ g_hash_table_insert(mimepart->typeparameters,
+ g_strdup("name"), g_strdup(ainfo->name));
+ g_hash_table_insert(mimepart->dispositionparameters,
+ g_strdup("filename"), g_strdup(ainfo->name));
+ mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
}
- fclose(attach_fp);
- }
-
- 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); \
- } \
- } \
+ procmime_encode_content(mimepart, ainfo->encoding);
+
+ g_node_append(parent->node, mimepart->node);
+ }
+}
+
+#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_utf8_collate(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;
}
+ g_free(str);
}
}
- 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_append_printf(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)
{
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(compose->account != NULL, NULL);
+ g_return_val_if_fail(compose->account->address != NULL, NULL);
- /* 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);
- 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_free(savefolderid);
- }
- fprintf(fp, "\n");
- }
+ header = g_string_sized_new(64);
/* Date */
if (compose->account->add_date) {
get_rfc822_date(buf, sizeof(buf));
- fprintf(fp, "Date: %s\n", buf);
+ g_string_append_printf(header, "Date: %s\n", buf);
}
/* From */
(buf, sizeof(buf), compose->account->name,
strlen("From: "), TRUE);
QUOTE_IF_REQUIRED(name, buf);
- fprintf(fp, "From: %s <%s>\n",
+ g_string_append_printf(header, "From: %s <%s>\n",
name, compose->account->address);
} else
- fprintf(fp, "From: %s\n", compose->account->address);
+ g_string_append_printf(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_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+ if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
strlen("Subject: "), FALSE);
- fprintf(fp, "Subject: %s\n", buf);
+ g_string_append_printf(header, "Subject: %s\n", buf);
}
}
+ g_free(str);
/* Message-ID */
if (compose->account->gen_msgid) {
- compose_generate_msgid(buf, sizeof(buf));
- fprintf(fp, "Message-ID: <%s>\n", buf);
+ generate_msgid(buf, sizeof(buf));
+ g_string_append_printf(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_append_printf(header, "In-Reply-To: <%s>\n", compose->inreplyto);
/* References */
if (compose->references)
- fprintf(fp, "References: %s\n", compose->references);
+ g_string_append_printf(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) &&
compose_convert_header(buf, sizeof(buf),
compose->account->organization,
strlen("Organization: "), FALSE);
- fprintf(fp, "Organization: %s\n", buf);
+ g_string_append_printf(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_append_printf(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_append_printf(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
(buf, sizeof(buf),
chdr->value ? chdr->value : "",
strlen(chdr->name) + 2, FALSE);
- fprintf(fp, "%s: %s\n", chdr->name, buf);
+ g_string_append_printf(header, "%s: %s\n", chdr->name, buf);
}
}
}
- /* MIME */
- fprintf(fp, "Mime-Version: 1.0\n");
- if (compose_use_attach(compose)) {
- compose->boundary = generate_mime_boundary(NULL);
- fprintf(fp,
- "Content-Type: multipart/mixed;\n"
- " boundary=\"%s\"\n", compose->boundary);
- } else {
- fprintf(fp, "Content-Type: text/plain; charset=%s\n", charset);
-#if USE_GPGME
- if (compose->use_signing && !compose->gnupg_mode)
- fprintf(fp, "Content-Disposition: inline\n");
-#endif
- fprintf(fp, "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_append_printf(header, "Importance: high\n"
"X-Priority: 1 (Highest)\n");
break;
- case PRIORITY_HIGH: fprintf(fp, "Importance: high\n"
+ case PRIORITY_HIGH: g_string_append_printf(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_append_printf(header, "Importance: low\n"
"X-Priority: 4 (Low)\n");
break;
- case PRIORITY_LOWEST: fprintf(fp, "Importance: low\n"
+ case PRIORITY_LOWEST: g_string_append_printf(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_append_printf(header, "Disposition-Notification-To: %s <%s>\n", buf, compose->account->address);
} else
- fprintf(fp, "Disposition-Notification-To: %s\n", compose->account->address);
+ g_string_append_printf(header, "Disposition-Notification-To: %s\n", compose->account->address);
}
}
g_free(tmp);
entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(headervalue, entry_str, return -1);
+ Xstrdup_a(headervalue, entry_str, return NULL);
subst_char(headervalue, '\r', ' ');
subst_char(headervalue, '\n', ' ');
string = std_headers;
string++;
}
if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
- fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
+ g_string_append_printf(header, "%s %s\n", headername_wcolon, headervalue);
g_free(headername);
g_free(headername_wcolon);
}
- /* separator between header and body */
- fputs("\n", fp);
+ str = header->str;
+ g_string_free(header, FALSE);
- return 0;
+ return str;
}
#undef IS_IN_CUSTOM_HEADER
g_free(tmpstr);
}
-static void compose_generate_msgid(gchar *buf, gint len)
-{
- struct tm *lt;
- time_t t;
- gchar *addr;
-
- t = time(NULL);
- lt = localtime(&t);
-
- addr = g_strconcat("@", get_domain_name(), NULL);
-
- g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
- lt->tm_year + 1900, lt->tm_mon + 1,
- lt->tm_mday, lt->tm_hour,
- lt->tm_min, lt->tm_sec,
- (guint)random(), addr);
-
- debug_print("generated Message-ID: %s\n", buf);
-
- g_free(addr);
-}
-
static void compose_create_header_entry(Compose *compose)
{
gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
}
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_before_cb), compose);
g_signal_connect_after(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(entry), "button-press-event",
- G_CALLBACK(compose_headerentry_button_pressed),
- NULL);
-
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MAX_SIZE);
+ if (!geometry.min_width) {
+ geometry.min_width = 600;
+ geometry.min_height = 480;
+ }
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
+ &geometry, GDK_HINT_MIN_SIZE);
gtk_widget_set_uposition(window, prefs_common.compose_x,
prefs_common.compose_y);
gtk_container_add(GTK_CONTAINER(subject_frame), subject);
edit_vbox = gtk_vbox_new(FALSE, 0);
-#if 0 /* NEW COMPOSE GUI */
- gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0);
-#endif
gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
text = gtk_text_view_new();
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
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);
ifactory = gtk_item_factory_from_widget(menubar);
menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
- menu_set_sensitive(ifactory, "/Message/Remove references", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Remove references", FALSE);
tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tools/Template");
-#if 0 /* NEW COMPOSE GUI */
- gtk_widget_hide(bcc_hbox);
- gtk_widget_hide(bcc_entry);
- gtk_widget_hide(reply_hbox);
- gtk_widget_hide(reply_entry);
- gtk_widget_hide(followup_hbox);
- gtk_widget_hide(followup_entry);
- gtk_widget_hide(ruler_hbox);
- gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
- gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
- gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
-
- if (account->protocol == A_NNTP) {
- gtk_widget_hide(to_hbox);
- gtk_widget_hide(to_entry);
- gtk_widget_hide(cc_hbox);
- gtk_widget_hide(cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 1, 0);
- gtk_table_set_row_spacing(GTK_TABLE(table), 3, 0);
- } else {
- gtk_widget_hide(newsgroups_hbox);
- gtk_widget_hide(newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
- }
-#endif
undostruct = undo_init(text);
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
compose->autowrap = prefs_common.autowrap;
-#if USE_GPGME
compose->use_signing = FALSE;
compose->use_encryption = FALSE;
-#endif /* USE_GPGME */
+ compose->privacy_system = NULL;
compose->modified = FALSE;
compose_select_account(compose, account, TRUE);
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)
/* Actions menu */
compose_update_actions_menu(compose);
-#if USE_GPGME
- activate_gnupg_mode(compose, account);
-#endif
+ /* Privacy Systems menu */
+ compose_update_privacy_systems_menu(compose);
+
+ activate_privacy_system(compose, account);
toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
gtk_widget_show(window);
switch (compose->priority) {
case PRIORITY_HIGHEST:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Highest");
+ (ifactory, "/Options/Priority/Highest");
break;
case PRIORITY_HIGH:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/High");
+ (ifactory, "/Options/Priority/High");
break;
case PRIORITY_NORMAL:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Normal");
+ (ifactory, "/Options/Priority/Normal");
break;
case PRIORITY_LOW:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Low");
+ (ifactory, "/Options/Priority/Low");
break;
case PRIORITY_LOWEST:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Lowest");
+ (ifactory, "/Options/Priority/Lowest");
break;
}
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
-#if USE_GPGME
-static void compose_set_gnupg_mode_cb(gpointer data,
- guint action,
- GtkWidget *widget)
+static void compose_set_privacy_system_cb(gpointer data,
+ guint action,
+ GtkWidget *widget)
{
Compose *compose = (Compose *) data;
- compose->gnupg_mode = action;
+ gchar *systemid;
+ GtkItemFactory *ifactory;
+ gboolean can_sign = FALSE, can_encrypt = FALSE;
+
+ systemid = g_object_get_data(G_OBJECT(widget), "privacy_system");
+ g_free(compose->privacy_system);
+ compose->privacy_system = NULL;
+ if (systemid != NULL) {
+ compose->privacy_system = g_strdup(systemid);
+
+ can_sign = privacy_system_can_sign(systemid);
+ can_encrypt = privacy_system_can_encrypt(systemid);
+ }
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
+ menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
}
-static void compose_update_gnupg_mode_menu_item(Compose * compose)
+static void compose_update_privacy_system_menu_item(Compose * compose)
{
+ static gchar *branch_path = "/Options/Privacy System";
GtkItemFactory *ifactory;
GtkWidget *menuitem = NULL;
+ GList *amenu;
+ gboolean can_sign = FALSE, can_encrypt = FALSE;
ifactory = gtk_item_factory_from_widget(compose->menubar);
-
- switch (compose->gnupg_mode) {
- case GNUPG_MODE_DETACH:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Mode/MIME");
- break;
- case GNUPG_MODE_INLINE:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Mode/Inline");
- break;
+
+ if (compose->privacy_system != NULL) {
+ gchar *systemid;
+
+ menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
+ g_return_if_fail(menuitem != NULL);
+
+ amenu = GTK_MENU_SHELL(menuitem)->children;
+ menuitem = NULL;
+ while (amenu != NULL) {
+ GList *alist = amenu->next;
+
+ systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
+ if (systemid != NULL)
+ if (strcmp(systemid, compose->privacy_system) == 0) {
+ menuitem = GTK_WIDGET(amenu->data);
+
+ can_sign = privacy_system_can_sign(systemid);
+ can_encrypt = privacy_system_can_encrypt(systemid);
+
+ break;
+ }
+
+ amenu = alist;
+ }
+ if (menuitem != NULL)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-
- if (compose->use_encryption == TRUE || compose->use_signing == TRUE)
- menu_set_sensitive(ifactory, "/Message/Mode", TRUE);
- else
- menu_set_sensitive(ifactory, "/Message/Mode", FALSE);
+
+ menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
+ menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
}
-#endif
static void compose_set_template_menu(Compose *compose)
{
action_update_compose_menu(ifactory, "/Tools/Actions", compose);
}
+void compose_update_privacy_systems_menu(Compose *compose)
+{
+ static gchar *branch_path = "/Options/Privacy System";
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem;
+ gchar *menu_path;
+ GSList *systems, *cur;
+ GList *amenu;
+ GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
+ GtkWidget *widget;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ /* remove old entries */
+ ifentry.path = branch_path;
+ menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
+ g_return_if_fail(menuitem != NULL);
+
+ amenu = GTK_MENU_SHELL(menuitem)->children->next;
+ while (amenu != NULL) {
+ GList *alist = amenu->next;
+ gtk_widget_destroy(GTK_WIDGET(amenu->data));
+ amenu = alist;
+ }
+
+ ifentry.accelerator = NULL;
+ ifentry.callback_action = 0;
+ ifentry.callback = compose_set_privacy_system_cb;
+ ifentry.item_type = "/Options/Privacy System/None";
+
+ systems = privacy_get_system_ids();
+ for (cur = systems; cur != NULL; cur = g_slist_next(cur)) {
+ gchar *systemid = cur->data;
+
+ menu_path = g_strdup_printf("%s/%s", branch_path,
+ privacy_system_get_name(systemid));
+ ifentry.path = menu_path;
+ gtk_item_factory_create_item(ifactory, &ifentry, compose, 1);
+ widget = gtk_item_factory_get_widget(ifactory, menu_path);
+
+ g_object_set_data_full(G_OBJECT(widget), "privacy_system",
+ g_strdup(systemid), g_free);
+
+ g_free(systemid);
+ g_free(menu_path);
+ }
+ g_slist_free(systems);
+}
+
void compose_reflect_prefs_all(void)
{
GList *cur;
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, "/Message/Insert file", sensitive);
+ menu_set_sensitive(ifactory, "/Message/Insert signature", sensitive);
menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", sensitive);
menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", sensitive);
menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
{
GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
toolbar_comp_set_sensitive(compose, allow);
- menu_set_sensitive(ifactory, "/File", allow);
+ menu_set_sensitive(ifactory, "/Message", allow);
menu_set_sensitive(ifactory, "/Edit", allow);
#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", allow);
#endif
- menu_set_sensitive(ifactory, "/Message", allow);
+ menu_set_sensitive(ifactory, "/Options", allow);
menu_set_sensitive(ifactory, "/Tools", allow);
menu_set_sensitive(ifactory, "/Help", allow);
}
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"),
void compose_draft (gpointer data)
{
- compose_draft_cb(data, 0, NULL);
+ compose_draft_cb(data, COMPOSE_QUIT_EDITING, NULL);
}
static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
MsgFlags flag = {0, 0};
static gboolean lock = FALSE;
MsgInfo *newmsginfo;
+ FILE *fp;
if (lock) return;
tmp = g_strdup_printf("%s%cdraft.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
+ if ((fp = fopen(tmp, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp, "fopen");
+ return;
+ }
+
+ /* chmod for security */
+ if (change_file_mode_rw(fp, tmp) < 0) {
+ FILE_OP_ERROR(tmp, "chmod");
+ g_warning("can't change file mode\n");
+ }
- if (compose_write_to_file(compose, tmp, TRUE) < 0) {
+ /* Save draft infos */
+ fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
+ fprintf(fp, "S:%s\n", compose->account->address);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ gchar *savefolderid;
+
+ savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ fprintf(fp, "SCF:%s\n", savefolderid);
+ g_free(savefolderid);
+ }
+ 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:%s\n", compose->privacy_system);
+ fprintf(fp, "\n");
+
+ if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
+ fclose(fp);
+ unlink(tmp);
g_free(tmp);
lock = FALSE;
return;
}
+ fclose(fp);
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
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_set_flags(newmsginfo, 0,
+ MSG_HAS_ATTACHMENT);
+
procmsg_msginfo_free(newmsginfo);
}
lock = FALSE;
- /* 0: quit editing 1: keep editing 2: keep editing (autosave) */
- if (action == 0)
+ if (action == COMPOSE_QUIT_EDITING)
gtk_widget_destroy(compose->window);
else {
struct stat s;
compose->targetinfo->folder = draft;
compose->mode = COMPOSE_REEDIT;
- if (action == 2) {
+ if (action == COMPOSE_AUTO_SAVE) {
compose->autosaved_draft = compose->targetinfo;
}
}
for ( tmp = file_list; tmp; tmp = tmp->next) {
gchar *file = (gchar *) tmp->data;
gchar *filedup = g_strdup(file);
- const gchar *shortfile = g_basename(filedup);
+ gchar *shortfile = g_path_get_basename(filedup);
ComposeInsertResult res;
res = compose_insert_file(compose, file);
alertpanel_error(_("File '%s' contained invalid characters\n"
"for the current encoding, insertion may be incorrect."), shortfile);
}
+ g_free(shortfile);
g_free(filedup);
g_free(file);
}
compose_remove_draft(compose);
break;
case G_ALERTALTERNATE:
- compose_draft_cb(data, 0, NULL);
+ compose_draft_cb(data, COMPOSE_QUIT_EDITING, NULL);
return;
default:
return;
compose_wrap_line_all_full(compose, TRUE);
}
-#if 0 /* NEW COMPOSE GUI */
-static void compose_toggle_to_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- Compose *compose = (Compose *)data;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->to_hbox);
- gtk_widget_show(compose->to_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 4);
- compose->use_to = TRUE;
- } else {
- gtk_widget_hide(compose->to_hbox);
- gtk_widget_hide(compose->to_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_to = FALSE;
- }
-
- if (addressbook_get_target_compose() == compose)
- addressbook_set_target_compose(compose);
-}
-
-static void compose_toggle_cc_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- Compose *compose = (Compose *)data;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->cc_hbox);
- gtk_widget_show(compose->cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 3, 4);
- compose->use_cc = TRUE;
- } else {
- gtk_widget_hide(compose->cc_hbox);
- gtk_widget_hide(compose->cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 3, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_cc = FALSE;
- }
-
- if (addressbook_get_target_compose() == compose)
- addressbook_set_target_compose(compose);
-}
-
-static void compose_toggle_bcc_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- Compose *compose = (Compose *)data;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->bcc_hbox);
- gtk_widget_show(compose->bcc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 4, 4);
- compose->use_bcc = TRUE;
- } else {
- gtk_widget_hide(compose->bcc_hbox);
- gtk_widget_hide(compose->bcc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 4, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_bcc = FALSE;
- }
-
- if (addressbook_get_target_compose() == compose)
- addressbook_set_target_compose(compose);
-}
-
-static void compose_toggle_replyto_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- Compose *compose = (Compose *)data;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->reply_hbox);
- gtk_widget_show(compose->reply_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 5, 4);
- compose->use_replyto = TRUE;
- } else {
- gtk_widget_hide(compose->reply_hbox);
- gtk_widget_hide(compose->reply_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 5, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_replyto = FALSE;
- }
-}
-
-static void compose_toggle_followupto_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- Compose *compose = (Compose *)data;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->followup_hbox);
- gtk_widget_show(compose->followup_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 6, 4);
- compose->use_followupto = TRUE;
- } else {
- gtk_widget_hide(compose->followup_hbox);
- gtk_widget_hide(compose->followup_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 6, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_followupto = FALSE;
- }
-}
-
-static void compose_toggle_attach_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- Compose *compose = (Compose *)data;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_ref(compose->edit_vbox);
-
- gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->edit_vbox);
- gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
- gtk_box_pack_start(GTK_BOX(compose->vbox2), compose->paned,
- TRUE, TRUE, 0);
- gtk_widget_show(compose->paned);
-
- gtk_widget_unref(compose->edit_vbox);
- gtk_widget_unref(compose->paned);
-
- compose->use_attach = TRUE;
- } else {
- gtk_widget_ref(compose->paned);
- gtk_widget_ref(compose->edit_vbox);
-
- gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->paned);
- gtkut_container_remove(GTK_CONTAINER(compose->paned),
- compose->edit_vbox);
- gtk_box_pack_start(GTK_BOX(compose->vbox2),
- compose->edit_vbox, TRUE, TRUE, 0);
-
- gtk_widget_unref(compose->edit_vbox);
-
- compose->use_attach = FALSE;
- }
-}
-#endif
-
-#if USE_GPGME
static void compose_toggle_sign_cb(gpointer data, guint action,
GtkWidget *widget)
{
compose->use_signing = TRUE;
else
compose->use_signing = FALSE;
-
- compose_update_gnupg_mode_menu_item(compose);
}
static void compose_toggle_encrypt_cb(gpointer data, guint action,
compose->use_encryption = TRUE;
else
compose->use_encryption = FALSE;
-
- compose_update_gnupg_mode_menu_item(compose);
}
-static void activate_gnupg_mode (Compose *compose, PrefsAccount *account)
+static void activate_privacy_system(Compose *compose, PrefsAccount *account)
{
- if (account->default_gnupg_mode)
- compose->gnupg_mode = GNUPG_MODE_INLINE;
- else
- compose->gnupg_mode = GNUPG_MODE_DETACH;
-
- compose_update_gnupg_mode_menu_item(compose);
+ g_free(compose->privacy_system);
+ compose->privacy_system = g_strdup(account->default_privacy_system);
+ compose_update_privacy_system_menu_item(compose);
}
-#endif /* USE_GPGME */
static void compose_toggle_ruler_cb(gpointer data, guint action,
GtkWidget *widget)
return FALSE;
}
-static gboolean compose_headerentry_button_pressed
- (GtkWidget *entry, GdkEventButton *event, gpointer data)
-{
- /* if this is a lclick, grab the focus */
- if (event->button == 1)
- gtk_widget_grab_focus(entry);
- return FALSE;
-}
-
static void compose_show_first_last_header(Compose *compose, gboolean show_first)
{
GtkAdjustment *vadj;
} else
gtk_text_buffer_insert(buffer, iter, text, len);
- if (prefs_common.autowrap)
+ if (compose->autowrap)
compose_wrap_line_all_full(compose, TRUE);
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
static gint compose_defer_auto_save_draft(Compose *compose)
{
compose->draft_timeout_tag = -1;
- compose_draft_cb((gpointer)compose, 2, NULL);
+ compose_draft_cb((gpointer)compose, COMPOSE_AUTO_SAVE, NULL);
return FALSE;
}
projects / claws.git / blobdiff