diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-07-24 14:18:36 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-07-24 14:18:36 +0800 |
| commit | 2131710f7575b2b549066e9af5f6f2fd399345df (patch) | |
| tree | 9cf9390e2da9a6c00b6b627a65ab273047ab023a /mail/mail-format.c | |
| parent | c1dee244344d21d22213d97a62c3139d9607473b (diff) | |
| download | gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.tar gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.tar.gz gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.tar.bz2 gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.tar.lz gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.tar.xz gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.tar.zst gsoc2013-evolution-2131710f7575b2b549066e9af5f6f2fd399345df.zip | |
Commit a fix that I thought I committed a while ago:
2002-07-24 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (handle_multipart_encrypted): Commit a fix that I
thought I committed a while ago:
* mail-format.c (handle_multipart_encrypted): Pass the correct
pointer into camel_multipart_encrypted_decrypt().
* mail-ops.c (mail_send_message): Rework the logic a bit. If we
find an account, use that to set the sent_folder_uri and the
transport_url, otherwise use the X-Evolution-Transport and
X-Evolution-Fcc headers.
svn path=/trunk/; revision=17566
Diffstat (limited to 'mail/mail-format.c')
| -rw-r--r-- | mail/mail-format.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mail/mail-format.c b/mail/mail-format.c index ddd57aca5b..693721bb3c 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1743,6 +1743,7 @@ static gboolean handle_multipart_encrypted (CamelMimePart *part, const char *mime_type, MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream) { + CamelMultipartEncrypted *mpe; CamelMimePart *mime_part; CamelCipherContext *cipher; CamelDataWrapper *wrapper; @@ -1755,11 +1756,11 @@ handle_multipart_encrypted (CamelMimePart *part, const char *mime_type, wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part)); - g_assert (CAMEL_IS_MULTIPART (wrapper)); + mpe = CAMEL_MULTIPART_ENCRYPTED (wrapper); camel_exception_init (&ex); cipher = mail_crypto_get_pgp_cipher_context (NULL); - mime_part = camel_multipart_encrypted_decrypt (CAMEL_MULTIPART_ENCRYPTED (wrapper), cipher, &ex); + mime_part = camel_multipart_encrypted_decrypt (mpe, cipher, &ex); camel_object_unref (cipher); if (camel_exception_is_set (&ex)) { |