From 7760ee15585aca92e42e860d9967ac4d70021c5a Mon Sep 17 00:00:00 2001
From: nobody <nobody@localhost>
Date: Tue, 4 Jun 2002 00:04:04 +0000
Subject: This commit was manufactured by cvs2svn to create tag
'EVOLUTION_1_0_6'.
svn path=/tags/EVOLUTION_1_0_6/; revision=17093
---
mail/mail-tools.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'mail/mail-tools.c')
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index efc4ab49e1..d80b3c04fa 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -237,7 +237,6 @@ mail_tool_destroy_xevolution (XEvolution *xev)
g_free (xev->source);
g_free (xev->transport);
g_free (xev->account);
- g_free (xev->format);
g_free (xev->fcc);
g_free (xev);
}
@@ -340,15 +339,11 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
gboolean want_plain;
gchar *text;
+ want_plain = !mail_config_get_send_html ();
contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
/* We pass "want_plain" for "cite", since if it's HTML, we'll
* do the citing ourself below.
*/
- /* FIXME the citing logic has changed and we basically never want_plain
- * to be true now, but I don't want to remove all that logic until I
- * am sure --Larry
- */
- want_plain = FALSE;
text = mail_get_message_body (contents, want_plain, want_plain);
/* Set the quoted reply text. */
@@ -369,7 +364,7 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
"<!--+GtkHTML:<DATA class=\"ClueFlow\" clear=\"orig\">-->",
credits ? credits : "",
mail_config_get_citation_color (),
- want_plain ? "" : "<blockquote type=cite><i>",
+ want_plain ? "" : "<blockquote><i>",
text,
want_plain ? "" : "</i></blockquote>");
g_free (text);
@@ -391,7 +386,7 @@ mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
gchar *
mail_tool_forward_message (CamelMimeMessage *message, gboolean quoted)
{
- char *title, *body, *ret;
+ gchar *title, *body, *ret;
body = mail_get_message_body (CAMEL_DATA_WRAPPER (message),
!mail_config_get_send_html (),
--
cgit