aboutsummaryrefslogtreecommitdiffstats
path: root/composer/Evolution-Composer.idl
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-02-26 00:36:59 +0800
committerDan Winship <danw@src.gnome.org>2002-02-26 00:36:59 +0800
commitc91f7c6b59f1a845bc98797c9d6bae5344136854 (patch)
tree7d4cd3bc10536913dd6359b3004fe19d47b02629 /composer/Evolution-Composer.idl
parent387acacf48126af9f050ba2e81f5aa1ec9456ff2 (diff)
downloadgsoc2013-evolution-c91f7c6b59f1a845bc98797c9d6bae5344136854.tar.gz
gsoc2013-evolution-c91f7c6b59f1a845bc98797c9d6bae5344136854.tar.zst
gsoc2013-evolution-c91f7c6b59f1a845bc98797c9d6bae5344136854.zip
[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
Diffstat (limited to 'composer/Evolution-Composer.idl')
-rw-r--r--composer/Evolution-Composer.idl22
1 files changed, 15 insertions, 7 deletions
diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl
index dcf52b57e1..543e6edd2d 100644
--- a/composer/Evolution-Composer.idl
+++ b/composer/Evolution-Composer.idl
@@ -48,11 +48,11 @@ module Evolution {
* Sets the kind of multipart message that is being
* created.
*
- * If @type is MIXED (the default), setBodyText()
+ * If @type is MIXED (the default), setBody()
* will create the body, and attachMIME() and
* attachData() will create attachments.
*
- * If @type is ALTERNATIVE, setBodyText() will create
+ * If @type is ALTERNATIVE, setBody() will create
* text/plain alternative, and each following
* attachMIME() or attachData() call will create
* another alternative.
@@ -63,13 +63,19 @@ module Evolution {
void setMultipartType (in MultipartType type);
/**
- * setBodyText:
+ * setBody:
* @body: the body
+ * @mime_type: the MIME type of @body
*
- * Sets the text in the body of the composer to
- * the given UTF-8 plain text.
+ * Sets the body of the composer to @body. If
+ * @mime_type is something other than "text/plain" or
+ * "text/html", the composer will not be editable
+ * (calling show() will raise an exception), and the
+ * composer will not attempt to assign a non-UTF8
+ * character set to the data. However, @mime_type may
+ * include parameters in that case.
**/
- void setBodyText (in string body);
+ void setBody (in string body, in string mime_type);
/**
* attachMIME:
@@ -117,7 +123,9 @@ module Evolution {
* Shows the composer and lets the user edit things
* and send the message.
**/
- void show ();
+ exception CannotShow {};
+ void show ()
+ raises (CannotShow);
/**