[pulled up from evolution-1-0-branch]

	Mailer side of 14705.

	* Evolution-Composer.idl (setBody): Change setBodyText to setBody
	and take a MIME type as well.
	(show): Add an exception.

	* evolution-composer.c (impl_Composer_set_body, etc): Update for
	IDL change. While I'm here, fix this to DTRT with both plaintext
	and HTML bodies. (It claimed to take plain text before, but then
	passed it to the composer as HTML.)
	(impl_Composer_show): Raise an exception if setBody has been
	called, since the composer window will not display the real data
	in that case.

	* e-msg-composer.c (e_msg_composer_set_body): interface for
	impl_Composer_set_body.
	(build_message): If e_msg_composer_set_body has been called, use
	the body and MIME type supplied to it rather than the contents of
	the HTML editor.

svn path=/trunk/; revision=15833

1 files changed, 5 insertions, 2 deletions

diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index cb679107b8..100760f87e 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -75,8 +75,8 @@ struct _EMsgComposer {
 	
 	Bonobo_ConfigDatabase    config_db;
 	
-	char *charset;
-	
+	char *mime_type, *mime_body, *charset;
+
 	char *autosave_file;
         int   autosave_fd;
 
@@ -126,6 +126,9 @@ void                     e_msg_composer_set_headers                      (EMsgCo
 									  const char        *subject);
 void                     e_msg_composer_set_body_text                    (EMsgComposer      *composer,
 									  const char        *text);
+void                     e_msg_composer_set_body                         (EMsgComposer      *composer,
+									  const char        *body,
+									  const char        *mime_type);
 void                     e_msg_composer_add_header                       (EMsgComposer      *composer,
 									  const char        *name,
 									  const char        *value);