static GtkTargetEntry compose_mime_types[] =
{
{"text/uri-list", 0, 0},
- {"text/plain", 0, 0},
- {"STRING", 0, 0}
+ {"UTF8_STRING", 0, 0},
+ {"text/plain", 0, 0}
};
static gboolean compose_put_existing_to_front(MsgInfo *info)
} else {
if (mailto) {
compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
- } else if (item) {
+ } else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
}
/*
compose_quote_fmt(compose, compose->replyinfo,
prefs_common.quotefmt,
qmark, body, FALSE);
+ quote_fmt_reset_vartable();
}
if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
compose_force_encryption(compose, account, FALSE);
compose_quote_fmt(compose, full_msginfo,
prefs_common.fw_quotefmt,
qmark, body, FALSE);
+ quote_fmt_reset_vartable();
compose_attach_parts(compose, msginfo);
procmsg_msginfo_free(full_msginfo);
gboolean use_signing = FALSE;
gboolean use_encryption = FALSE;
gchar *privacy_system = NULL;
+ int priority = PRIORITY_NORMAL;
+ MsgInfo *replyinfo = NULL, *fwdinfo = NULL;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Priority: ")) {
param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
- compose->priority = param;
+ priority = param;
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "RMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("RMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ replyinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "FMID:")) {
+ gchar **tokens = g_strsplit(&queueheader_buf[strlen("FMID:")], "\t", 0);
+ if (tokens[0] && tokens[1] && tokens[2]) {
+ FolderItem *orig_item = folder_find_item_from_identifier(tokens[0]);
+ if (orig_item != NULL) {
+ fwdinfo = folder_item_get_msginfo_by_msgid(orig_item, tokens[2]);
+ }
+ }
+ g_strfreev(tokens);
}
} else {
account = msginfo->folder->folder->account;
compose = compose_create(account, COMPOSE_REEDIT, batch);
+ compose->replyinfo = replyinfo;
+ compose->fwdinfo = fwdinfo;
+
compose->updating = TRUE;
-
+ compose->priority = priority;
+
if (privacy_system != NULL) {
compose->privacy_system = privacy_system;
compose_use_signing(compose, use_signing);
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL, FALSE);
+ quote_fmt_reset_vartable();
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
compose_colorize_signature(compose);
gchar *subject = NULL;
gchar *body = NULL;
gchar *temp = NULL;
- gint len = 0;
+ guint len = 0;
scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body);
if (msginfo->subject && *msginfo->subject) {
gchar *buf, *buf2;
- guchar *p;
+ gchar *p;
buf = p = g_strdup(msginfo->subject);
p += subject_get_prefix_length(p);
gchar *msgpath = NULL;
gboolean discard_window = FALSE;
gchar *errstr = NULL;
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+
if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
|| compose->batch == TRUE)
discard_window = TRUE;
goto bail;
}
+ inc_lock();
val = compose_queue(compose, &msgnum, &folder, &msgpath, TRUE);
if (val) {
if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
} else if (val == -3) {
if (privacy_peek_error())
alertpanel_error(_("Could not queue message for sending:\n\n"
if (!discard_window) {
goto bail;
}
+ inc_unlock();
return -1;
}
-
if (msgpath == NULL) {
msgpath = folder_item_fetch_msg(folder, msgnum);
- val = procmsg_send_message_queue(msgpath, &errstr);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
g_free(msgpath);
} else {
- val = procmsg_send_message_queue(msgpath, &errstr);
+ val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum);
g_unlink(msgpath);
g_free(msgpath);
}
if (!discard_window) {
goto bail;
}
+ inc_unlock();
return -1;
}
-
+ inc_unlock();
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
return 0;
bail:
+ inc_unlock();
compose_allow_user_actions (compose, TRUE);
compose->sending = FALSE;
compose->modified = TRUE;
+ toolbar_main_set_sensitive(mainwin);
+ main_window_set_menu_sensitive(mainwin);
return -1;
}
mimetext->subtype = g_strdup("plain");
g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
g_strdup(out_codeset));
+
/* protect trailing spaces when signing message */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system)) {
encoding = ENC_QUOTED_PRINTABLE;
}
+ debug_print("main text: %d bytes encoded as %s in %d\n",
+ strlen(buf), out_codeset, encoding);
+
/* check for line length limit */
if (action == COMPOSE_WRITE_FOR_SEND &&
encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
/* and if encdata was null, it means there's been a problem in
* key selection */
+ lock = FALSE;
+ fclose(fp);
+ g_unlink(tmp);
+ g_free(tmp);
+ return -5;
}
g_free(encdata);
}
/* process the other fields */
compose_template_apply_fields(compose, tmpl);
-
+ quote_fmt_reset_vartable();
compose_changed_cb(NULL, compose);
}
Compose *compose = (Compose *)data;
gint val;
+ inc_lock();
val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
- if (!val)
+ inc_unlock();
+
+ if (!val) {
compose_close(compose);
- else if (val == -1) {
+ } else if (val == -1) {
alertpanel_error(_("Could not queue message."));
} else if (val == -2) {
alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
} else if (val == -4) {
alertpanel_error(_("Could not queue message for sending:\n\n"
"Charset conversion failed."));
+ } else if (val == -5) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Couldn't get recipient encryption key."));
}
+ toolbar_main_set_sensitive(mainwindow_get_mainwindow());
}
void compose_draft (gpointer data)
fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
}
+ /* Message-ID of message replying to */
+ if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
+ gchar *folderid;
+
+ folderid = folder_item_get_identifier(compose->replyinfo->folder);
+ fprintf(fp, "RMID:%s\t%d\t%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid);
+ g_free(folderid);
+ }
+ /* Message-ID of message forwarding to */
+ if ((compose->fwdinfo != NULL) && (compose->fwdinfo->msgid != NULL)) {
+ gchar *folderid;
+
+ folderid = folder_item_get_identifier(compose->fwdinfo->folder);
+ fprintf(fp, "FMID:%s\t%d\t%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid);
+ g_free(folderid);
+ }
+
/* end of headers */
fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");
GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
GtkTextIter start_iter, end_iter;
gint start, end;
-
gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(clip));
if (contents == NULL)
return;
+ undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
+
/* we shouldn't delete the selection when middle-click-pasting, or we
* can't mid-click-paste our own selection */
- if (clip != GDK_SELECTION_PRIMARY)
+ if (clip != GDK_SELECTION_PRIMARY) {
gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
+ }
if (insert_place == NULL) {
/* if insert_place isn't specified, insert at the cursor.
gtk_text_iter_backward_char(&start_iter);
compose_beautify_paragraph(compose, &start_iter, TRUE);
}
-
} else if (GTK_IS_EDITABLE(entry))
gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
gtk_text_buffer_place_cursor(buffer, iter);
compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE);
+ quote_fmt_reset_vartable();
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation - 1));
projects / claws.git / blobdiff