debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source
This commit is contained in:
David Bremner 2012-03-10 21:46:26 -04:00
commit c46764030d
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -281,6 +281,7 @@ for gmimepc in gmime-2.6 gmime-2.4; do
have_gmime=1 have_gmime=1
gmime_cflags=$(pkg-config --cflags $gmimepc) gmime_cflags=$(pkg-config --cflags $gmimepc)
gmime_ldflags=$(pkg-config --libs $gmimepc) gmime_ldflags=$(pkg-config --libs $gmimepc)
break
fi fi
done done
if [ "$have_gmime" = "0" ]; then if [ "$have_gmime" = "0" ]; then

10
emacs/notmuch-mua.el
View file

@ -95,6 +95,9 @@ list."
(goto-char (point-min)) (goto-char (point-min))
(setq headers (mail-header-extract))))) (setq headers (mail-header-extract)))))
(forward-line 1) (forward-line 1)
;; Original message may contain (malicious) MML tags. We must
;; properly quote them in the reply.
(mml-quote-region (point) (point-max))
(setq body (buffer-substring (point) (point-max)))) (setq body (buffer-substring (point) (point-max))))
;; If sender is non-nil, set the From: header to its value. ;; If sender is non-nil, set the From: header to its value.
(when sender (when sender
@ -116,12 +119,7 @@ list."
(push-mark)) (push-mark))
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
(message-goto-body) (message-goto-body))
;; Original message may contain (malicious) MML tags. We must
;; properly quote them in the reply. Note that using `point-max'
;; instead of `mark' here is wrong. The buffer may include user's
;; signature which should not be MML-quoted.
(mml-quote-region (point) (mark)))
(defun notmuch-mua-forward-message () (defun notmuch-mua-forward-message ()
(message-forward) (message-forward)

15
mime-node.c
View file

@ -97,11 +97,26 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
} }
mctx->stream = g_mime_stream_file_new (mctx->file); mctx->stream = g_mime_stream_file_new (mctx->file);
if (!mctx->stream) {
fprintf (stderr, "Out of memory.\n");
status = NOTMUCH_STATUS_OUT_OF_MEMORY;
goto DONE;
}
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (mctx->stream), FALSE); g_mime_stream_file_set_owner (GMIME_STREAM_FILE (mctx->stream), FALSE);
mctx->parser = g_mime_parser_new_with_stream (mctx->stream); mctx->parser = g_mime_parser_new_with_stream (mctx->stream);
if (!mctx->parser) {
fprintf (stderr, "Out of memory.\n");
status = NOTMUCH_STATUS_OUT_OF_MEMORY;
goto DONE;
}
mctx->mime_message = g_mime_parser_construct_message (mctx->parser); mctx->mime_message = g_mime_parser_construct_message (mctx->parser);
if (!mctx->mime_message) {
fprintf (stderr, "Failed to parse %s\n", filename);
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
mctx->cryptoctx = cryptoctx; mctx->cryptoctx = cryptoctx;
mctx->decrypt = decrypt; mctx->decrypt = decrypt;