Deal with having multiple selected messages.

	* mail-ops.c (forward_msg): Deal with having multiple selected
	messages.

	* mail-format.c (mail_generate_forward): Removed. (Integrated into
	forward_msg)

svn path=/trunk/; revision=3982

1 files changed, 0 insertions, 45 deletions

diff --git a/mail/mail-format.c b/mail/mail-format.c
index 909eced8ca..56f361aebf 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1437,48 +1437,3 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
 
 	return composer;
 }
-
-EMsgComposer *
-mail_generate_forward (CamelMimeMessage *mime_message,
-		       gboolean forward_as_attachment,
-		       gboolean keep_attachments)
-{
-	EMsgComposer *composer;
-	CamelMimePart *part;
-	const char *from, *subject;
-	char *fwd_subj;
-
-	if (!forward_as_attachment)
-		g_warning ("Forward as non-attachment not implemented.");
-	if (!keep_attachments)
-		g_warning ("Forwarding without attachments not implemented.");
-
-	composer = E_MSG_COMPOSER (e_msg_composer_new ());
-
-	part = camel_mime_part_new ();
-	camel_mime_part_set_disposition (part, "inline");
-	camel_mime_part_set_description (part, "forwarded message");
-	camel_medium_set_content_object (CAMEL_MEDIUM (part),
-					 CAMEL_DATA_WRAPPER (mime_message));
-	camel_mime_part_set_content_type (part, "message/rfc822");
-
-	e_msg_composer_attach (composer, part);
-	gtk_object_unref (GTK_OBJECT (part));
-
-	from = camel_mime_message_get_from (mime_message);
-	subject = camel_mime_message_get_subject (mime_message);
-	if (from) {
-		if (subject && *subject) {
-			while (*subject == ' ')
-				subject++;
-			fwd_subj = g_strdup_printf ("[%s] %s", from, subject);
-		} else {
-			fwd_subj = g_strdup_printf ("[%s] (forwarded message)",
-						    from);
-		}
-	}
-	e_msg_composer_set_headers (composer, NULL, NULL, NULL, fwd_subj);
-	g_free (fwd_subj);
-
-	return composer;
-}