diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/em-format-quote.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index cd7abf25a6..ca85436fe1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2004-02-09 Not Zed <NotZed@Ximian.com> + + * em-format-quote.c (emfq_format_message): just print the \n after + the credits in the same printf, rather than adding an else. Add a + <br> too, otherwise it has no effect. + 2004-02-06 Jeffrey Stedfast <fejj@ximian.com> * em-format-html.c (efh_format_headers): Make private (only diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index a58cf05583..3d242c0956 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -152,15 +152,13 @@ emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMedium *part) EMFormatQuote *emfq = (EMFormatQuote *) emf; if (emfq->credits) - camel_stream_printf(stream, "%s", emfq->credits); + camel_stream_printf(stream, "%s<br>\n", emfq->credits); if (emfq->flags & EM_FORMAT_QUOTE_CITE) camel_stream_printf(stream, "<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"orig\" value=\"1\">-->\n" "<blockquote type=cite>\n" "<font color=\"#%06x\">\n", emfq->citation_colour & 0xffffff); - else - camel_stream_write (stream, "\n", 1); if (emfq->flags & EM_FORMAT_QUOTE_HEADERS) { camel_stream_printf(stream, "<b>To: </b> Header goes here<br>"); @@ -214,8 +212,8 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E /* Check for RFC 2646 flowed text. */ type = camel_mime_part_get_content_type(part); - if (camel_content_type_is (type, "text", "plain") - && (format = camel_content_type_param (type, "format")) + if (camel_content_type_is(type, "text", "plain") + && (format = camel_content_type_param(type, "format")) && !g_ascii_strcasecmp(format, "flowed")) flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED; |