a few fixes.

2004-05-25  Jeffrey Stedfast  <fejj@novell.com>

	* mail-errors.xml: a few fixes.

	* em-format-quote.c (emfq_text_plain): Only strip the signature if
	we are in some wy modifying the content (we don't want to remove
	the signature if we are editing the message as a new
	message). Fixes bug #58826.

svn path=/trunk/; revision=26079

4 files changed, 21 insertions, 8 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e049b325af..e03c70bb72 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-25  Jeffrey Stedfast  <fejj@novell.com>
+
+	* mail-errors.xml: a few fixes.
+
+	* em-format-quote.c (emfq_text_plain): Only strip the signature if
+	we are in some wy modifying the content (we don't want to remove
+	the signature if we are editing the message as a new
+	message). Fixes bug #58826.
+
 2004-05-25  Not Zed  <NotZed@Ximian.com>
 
 	* em-folder-view.c (emfv_popup_menu[]): disable add sender to
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index f0f45787ae..e25b182a31 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -427,7 +427,7 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E
 	CamelContentType *type;
 	const char *format;
 	guint32 rgb = 0x737373, flags;
-
+	
 	flags = emfq->text_html_flags;
 	
 	/* Check for RFC 2646 flowed text. */
@@ -437,13 +437,17 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E
 	    && !g_ascii_strcasecmp(format, "flowed"))
 		flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
 	
-	sig_strip = em_stripsig_filter_new();
-	html_filter = camel_mime_filter_tohtml_new(flags, rgb);
 	filtered_stream = camel_stream_filter_new_with_stream(stream);
-	camel_stream_filter_add(filtered_stream, sig_strip);
+	
+	if (emfq->flags != 0) {
+		sig_strip = em_stripsig_filter_new ();
+		camel_stream_filter_add (filtered_stream, sig_strip);
+		camel_object_unref (sig_strip);
+	}
+	
+	html_filter = camel_mime_filter_tohtml_new(flags, rgb);
 	camel_stream_filter_add(filtered_stream, html_filter);
 	camel_object_unref(html_filter);
-	camel_object_unref(sig_strip);
 	
 	em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, camel_medium_get_content_object((CamelMedium *)part));
 	camel_stream_flush((CamelStream *)filtered_stream);
diff --git a/mail/mail-errors.xml b/mail/mail-errors.xml
index 1b6582e7e1..0a9996dc8b 100644
--- a/mail/mail-errors.xml
+++ b/mail/mail-errors.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <error-list domain="mail">
 
  <error id="camel-service-auth-invalid" type="warning">
@@ -77,7 +77,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
  </error>
 
  <error id="camel-exception" type="warning">
-  <primary>Your message message, with the subject &quot;{0}&quot; was not delivered.</primary>
+  <primary>Your message with the subject &quot;{0}&quot; was not delivered.</primary>
   <secondary>The message was sent via the &quot;sendmail&quot; external application.  Sendmail reports the following error: status 67: mail not sent.
 The message is stored in the Outbox folder.  Check the message for errors and resend.</secondary>
  </error>
diff --git a/mail/mail-errors.xml.h b/mail/mail-errors.xml.h
index 2f6b7461a9..8e1b4acec1 100644
--- a/mail/mail-errors.xml.h
+++ b/mail/mail-errors.xml.h
@@ -54,7 +54,7 @@ char *s = N_("You have unsent messages, do you wish to quit anyway?");
 /* mail:exit-unsaved secondary */
 char *s = N_("If you quit, these messages will not be sent until Evolution is started again.");
 /* mail:camel-exception primary */
-char *s = N_("Your message message, with the subject \"{0}\" was not delivered.");
+char *s = N_("Your message with the subject \"{0}\" was not delivered.");
 /* mail:camel-exception secondary */
 char *s = N_("The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
 	"The message is stored in the Outbox folder.  Check the message for errors and resend.");