aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-hdrs.c1
-rw-r--r--composer/e-msg-composer.c24
3 files changed, 27 insertions, 4 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 43bb368521..6a1f530640 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-08 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (e_msg_composer_get_message_draft): Set the
+ PGP/MIME and S/MIME options to FALSE before getting the message
+ draft and restore the values afterward.
+
2001-08-06 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (add_inlined_image): Use g_basename().
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 472d3ba0ce..fe11b8c6d6 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -210,7 +210,6 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs)
else
label = g_strdup_printf ("%s <%s>", account->id->name, account->id->address);
-
native_label = e_utf8_to_gtk_string (GTK_WIDGET (menu), label);
item = gtk_menu_item_new_with_label (native_label);
g_free (native_label);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 55f4595c61..aac2d45cc9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2979,14 +2979,32 @@ e_msg_composer_get_message_draft (EMsgComposer *composer)
{
CamelMimeMessage *msg;
const MailConfigAccount *account;
- gint old_send_html;
-
+ gboolean old_send_html;
+ gboolean old_pgp_sign;
+ gboolean old_pgp_encrypt;
+ gboolean old_smime_sign;
+ gboolean old_smime_encrypt;
+
/* always save drafts as HTML to preserve formatting */
old_send_html = composer->send_html;
composer->send_html = TRUE;
+ old_pgp_sign = composer->pgp_sign;
+ composer->pgp_sign = FALSE;
+ old_pgp_encrypt = composer->pgp_encrypt;
+ composer->pgp_encrypt = FALSE;
+ old_smime_sign = composer->smime_sign;
+ composer->smime_sign = FALSE;
+ old_smime_encrypt = composer->smime_encrypt;
+ composer->smime_encrypt = FALSE;
+
msg = e_msg_composer_get_message (composer);
+
composer->send_html = old_send_html;
-
+ composer->pgp_sign = old_pgp_sign;
+ composer->pgp_encrypt = old_pgp_encrypt;
+ composer->smime_sign = old_smime_sign;
+ composer->smime_encrypt = old_smime_encrypt;
+
/* Attach whether this message was written in HTML */
camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Format",
composer->send_html ? "text/html" : "text/plain");