[evolution/gnome-3-0] Bug 653568 - Forward as Redirect doesn't work

[Matthew Barnes <mbarnes src gnome org>]

commit f864edefe70482e536fd4056514f911bc053734d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 10 13:35:34 2011 -0400

    Bug 653568 - Forward as Redirect doesn't work
    
    X-Evolution-Account and X-Evolution-Transport headers were not getting
    set in redirected messages.

 composer/e-msg-composer.c |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 0fa24df..e4c1c74 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -528,6 +528,19 @@ build_message_headers (EMsgComposer *composer,
 		} else
 			camel_mime_message_set_from (message, addr);
 		g_object_unref (addr);
+
+		/* X-Evolution-Account */
+		camel_medium_set_header (
+			medium, "X-Evolution-Account", account->uid);
+
+		/* X-Evolution-Fcc */
+		camel_medium_set_header (
+			medium, "X-Evolution-Fcc", account->sent_folder_uri);
+
+		/* X-Evolution-Transport */
+		camel_medium_set_header (
+			medium, "X-Evolution-Transport",
+			account->transport->url);
 	}
 
 	/* Reply-To: */
@@ -1050,6 +1063,7 @@ composer_build_message (EMsgComposer *composer,
 
 	/* If this is a redirected message, just tweak the headers. */
 	if (priv->redirect) {
+		context->skip_content = TRUE;
 		context->message = g_object_ref (priv->redirect);
 		build_message_headers (composer, context->message, TRUE);
 		g_simple_async_result_complete (simple);
@@ -1084,33 +1098,16 @@ composer_build_message (EMsgComposer *composer,
 			CAMEL_MEDIUM (context->message),
 			"X-Priority", "1");
 
-	if (account != NULL) {
-		/* X-Evolution-Account */
-		camel_medium_set_header (
-			CAMEL_MEDIUM (context->message),
-			"X-Evolution-Account", account->uid);
-
-		/* X-Evolution-Fcc */
-		camel_medium_set_header (
-			CAMEL_MEDIUM (context->message),
-			"X-Evolution-Fcc", account->sent_folder_uri);
+	/* Organization */
+	if (account != NULL && account->id->organization != NULL) {
+		gchar *organization;
 
-		/* X-Evolution-Transport */
+		organization = camel_header_encode_string (
+			(const guchar *) account->id->organization);
 		camel_medium_set_header (
 			CAMEL_MEDIUM (context->message),
-			"X-Evolution-Transport", account->transport->url);
-
-		/* Organization */
-		if (account->id->organization != NULL) {
-			gchar *organization;
-
-			organization = camel_header_encode_string (
-				(const guchar *) account->id->organization);
-			camel_medium_set_header (
-				CAMEL_MEDIUM (context->message),
-				"Organization", organization);
-			g_free (organization);
-		}
+			"Organization", organization);
+		g_free (organization);
 	}
 
 	/* X-Evolution-Format */