aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog4
-rw-r--r--composer/e-msg-composer.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 06603be064..5a9223d7ea 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-31 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (build_message): Oops. Fix a few compile problems.
+
2001-05-31 Christopher James Lahey <clahey@ximian.com>
* Makefile.am (HTML_EDITOR_GENERATED): Use GTKHTML_DATADIR here.
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 28800e5be8..4011dd316e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -449,13 +449,14 @@ build_message (EMsgComposer *composer)
if (composer->smime_sign) {
/* FIXME: should use the S/MIME signature certificate email address */
CamelMimeMessage *smime_mesg;
+ CamelInternetAddress *from;
const char *address;
camel_exception_init (&ex);
from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer->hdrs));
camel_internet_address_get (from, 0, NULL, &address);
- smime_mesg = mail_crypto_smime_sign (message, address, TRUE, TRUE, &ex);
+ smime_mesg = mail_crypto_smime_sign (new, address, TRUE, TRUE, &ex);
camel_object_unref (CAMEL_OBJECT (from));
@@ -469,6 +470,7 @@ build_message (EMsgComposer *composer)
if (composer->smime_encrypt) {
/* FIXME: we should try to get the preferred cert "nickname" for each recipient */
const CamelInternetAddress *addr;
+ CamelInternetAddress *from;
CamelMimeMessage *smime_mesg;
const char *address;
GPtrArray *recipients;
@@ -501,7 +503,7 @@ build_message (EMsgComposer *composer)
from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer->hdrs));
camel_internet_address_get (from, 0, NULL, &address);
- smime_mesg = mail_crypto_smime_encrypt (message, address, recipients, &ex);
+ smime_mesg = mail_crypto_smime_encrypt (new, address, recipients, &ex);
camel_object_unref (CAMEL_OBJECT (from));