From 44f24cdf5a76bd8b6288cfa94e275453565c92f0 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 5 Aug 2005 06:53:35 +0000 Subject: ** See bug #273885. 2005-08-04 Not Zed ** See bug #273885. * em-utils.c (em_utils_edit_filters): setup filter source names properly translated. * em-filter-editor.c (em_filter_editor_construct): take an array of structs for the filter source so the incoming/outgoing is properly translated. ** See bug #312397. * em-format-quote.c (emfq_format_message): dont quote credits here. (emfq_format_message_prefix): new prefix handler for credits. (emfq_format_clone): invoke the message prefix before anything else. ** See bug #310840. * em-icon-stream.c (em_icon_stream_get_image): check for /0 possibility. ** See bug #308512. * em-account-editor.c (emae_authtype_changed): take into account the writability of the password when sensitising remember password. (get_password): small hack to disable the save-password button when appropriate. svn path=/trunk/; revision=29997 --- mail/em-format-quote.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'mail/em-format-quote.c') diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index f7df8fcccc..90751ee48f 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -143,6 +143,9 @@ emfq_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMime camel_stream_reset(emfq->stream); + handle = em_format_find_handler(emf, "x-evolution/message/prefix"); + if (handle) + handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle); handle = em_format_find_handler(emf, "x-evolution/message/rfc822"); if (handle) handle->handler(emf, emfq->stream, (CamelMimePart *)msg, handle); @@ -363,12 +366,18 @@ emfq_format_headers (EMFormatQuote *emfq, CamelStream *stream, CamelMedium *part } static void -emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) +emfq_format_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) { EMFormatQuote *emfq = (EMFormatQuote *) emf; if (emfq->credits) camel_stream_printf(stream, "%s
\n", emfq->credits); +} + +static void +emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) +{ + EMFormatQuote *emfq = (EMFormatQuote *) emf; if (emfq->flags & EM_FORMAT_QUOTE_CITE) camel_stream_printf(stream, "\n" @@ -517,6 +526,7 @@ static EMFormatHandler type_builtin_table[] = { /* internal evolution types */ { "x-evolution/message/rfc822", (EMFormatFunc)emfq_format_message }, + { "x-evolution/message/prefix", (EMFormatFunc)emfq_format_message_prefix }, }; static void -- cgit