+2007-06-04 [colin] 2.9.2cvs37
+
+ * src/compose.c
+ Use original mail file for forward/redirect
+ Fixes some forwarded mails to be attached as
+ application/octet-stream (when they have binary
+ parts), and incidentally fixes bug 848
+ 'Redirect breaks GnuPG'
+
2007-06-04 [wwp] 2.9.2cvs36
* src/compose.c
( cvs diff -u -r 1.105.2.99 -r 1.105.2.100 src/prefs_account.c; cvs diff -u -r 1.49.2.30 -r 1.49.2.31 src/prefs_account.h; ) > 2.9.2cvs34.patchset
( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_quote.c; ) > 2.9.2cvs35.patchset
( cvs diff -u -r 1.382.2.383 -r 1.382.2.384 src/compose.c; ) > 2.9.2cvs36.patchset
+( cvs diff -u -r 1.382.2.384 -r 1.382.2.385 src/compose.c; ) > 2.9.2cvs37.patchset
if (as_attach) {
gchar *msgfile;
- msgfile = procmsg_get_message_file_path(msginfo);
+ msgfile = procmsg_get_message_file(msginfo);
if (!is_file_exist(msgfile))
g_warning("%s: file not exist\n", msgfile);
else
undo_block(compose->undostruct);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
- msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
+ msgfile = procmsg_get_message_file((MsgInfo *)msginfo->data);
if (!is_file_exist(msgfile))
g_warning("%s: file not exist\n", msgfile);
gtk_widget_grab_focus(compose->header_last->entry);
- filename = procmsg_get_message_file_path(msginfo);
+ filename = procmsg_get_message_file(msginfo);
if (filename == NULL) {
compose->updating = FALSE;
/* if we meet a pgp signature, we don't attach it, but
* we force signing. */
- if (strcmp(content_type, "application/pgp-signature") &&
+ if ((strcmp(content_type, "application/pgp-signature") &&
strcmp(content_type, "application/pkcs7-signature") &&
- strcmp(content_type, "application/x-pkcs7-signature")) {
+ strcmp(content_type, "application/x-pkcs7-signature"))
+ || compose->mode == COMPOSE_REDIRECT) {
partname = procmime_mimeinfo_get_parameter(child, "filename");
if (partname == NULL)
partname = procmime_mimeinfo_get_parameter(child, "name");
if (procmime_msginfo_is_encrypted(orig_msginfo)) {
originally_enc = TRUE;
}
- }
+ tmp_msginfo->folder = orig_msginfo->folder;
+ tmp_msginfo->msgnum = orig_msginfo->msgnum;
+ }
}
}