aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-08-29 03:46:10 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-08-29 03:46:10 +0800
commit248cb28e5284513bba3f68b197073bcc518d6f54 (patch)
tree4eb9d3940c5e70bdcfed16aa2ed42ae763e6ddab
parent1e291c07c0b145d4d4183c92cd83867a61fd38ed (diff)
downloadgsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.tar
gsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.tar.gz
gsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.tar.bz2
gsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.tar.lz
gsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.tar.xz
gsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.tar.zst
gsoc2013-evolution-248cb28e5284513bba3f68b197073bcc518d6f54.zip
Always request to import the HTML version if at all possible so that we
2000-08-28 Jeffrey Stedfast <fejj@helixcode.com> * e-msg-composer.c (e_msg_composer_new_with_message): Always request to import the HTML version if at all possible so that we maintain formatting and other nifty stuff :-) svn path=/trunk/; revision=5085
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-hdrs.c2
-rw-r--r--composer/e-msg-composer.c6
3 files changed, 9 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 37373a545e..91f4f2dee6 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,5 +1,11 @@
2000-08-28 Jeffrey Stedfast <fejj@helixcode.com>
+ * e-msg-composer.c (e_msg_composer_new_with_message): Always
+ request to import the HTML version if at all possible so that we
+ maintain formatting and other nifty stuff :-)
+
+2000-08-28 Jeffrey Stedfast <fejj@helixcode.com>
+
* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Set the
"From" address in the CamelMimeMessage. Also updated to use
get_subject to both make our lives easier and prepare for using UTF8
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 96e2fded2e..c3e5c770cb 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -690,7 +690,7 @@ e_msg_composer_hdrs_get_cc_entry (EMsgComposerHdrs *hdrs)
{
g_return_val_if_fail (hdrs != NULL, NULL);
g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
-
+
return hdrs->priv->cc_entry;
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 2090d985ac..4329731d08 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1381,7 +1381,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *msg)
{
const CamelInternetAddress *to, *cc, *bcc;
GList *To = NULL, *Cc = NULL, *Bcc = NULL;
- gboolean want_plain, is_html;
+ gboolean is_html;
CamelDataWrapper *contents;
const gchar *subject;
GtkWidget *new;
@@ -1429,10 +1429,8 @@ e_msg_composer_new_with_message (CamelMimeMessage *msg)
free_recipients (Cc);
free_recipients (Bcc);
- want_plain = !mail_config_send_html ();
-
contents = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
- text = mail_get_message_body (contents, want_plain, &is_html);
+ text = mail_get_message_body (contents, FALSE, &is_html);
if (is_html)
final_text = g_strdup (text);
else