diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-11-10 11:40:00 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-11-11 04:54:43 +0800 |
| commit | 2c4ae5e7685c462f8d464448e4617b8dea029e72 (patch) | |
| tree | c34f0cbb7c500ff70f10fce846631b0a948b341c /em-format/e-mail-parser-application-smime.c | |
| parent | 583da46b8caf4b2a8b548b03c38fe0e84164abfb (diff) | |
| download | gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.tar gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.tar.gz gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.tar.bz2 gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.tar.lz gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.tar.xz gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.tar.zst gsoc2013-evolution-2c4ae5e7685c462f8d464448e4617b8dea029e72.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'em-format/e-mail-parser-application-smime.c')
| -rw-r--r-- | em-format/e-mail-parser-application-smime.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c index 11513e3dc2..9fbf24e3ff 100644 --- a/em-format/e-mail-parser-application-smime.c +++ b/em-format/e-mail-parser-application-smime.c @@ -93,19 +93,18 @@ empe_app_smime_parse (EMailParserExtension *extension, opart = camel_mime_part_new (); valid = camel_cipher_context_decrypt_sync ( - context, part, opart, - cancellable, &local_error); + context, part, opart, + cancellable, &local_error); e_mail_part_preserve_charset_in_content_type (part, opart); - if (valid == NULL) { + if (local_error != NULL) { parts = e_mail_parser_error ( parser, cancellable, _("Could not parse S/MIME message: %s"), - local_error->message ? - local_error->message : - _("Unknown error")); - g_clear_error (&local_error); + local_error->message); + g_error_free (local_error); + } else { gint len = part_id->len; @@ -123,7 +122,8 @@ empe_app_smime_parse (EMailParserExtension *extension, if (!mail_part) continue; - e_mail_part_update_validity (mail_part, valid, + e_mail_part_update_validity ( + mail_part, valid, E_MAIL_PART_VALIDITY_ENCRYPTED | E_MAIL_PART_VALIDITY_SMIME); @@ -144,7 +144,8 @@ empe_app_smime_parse (EMailParserExtension *extension, if (button && button->data) { mail_part = button->data; - e_mail_part_update_validity (mail_part, valid, + e_mail_part_update_validity ( + mail_part, valid, E_MAIL_PART_VALIDITY_ENCRYPTED | E_MAIL_PART_VALIDITY_SMIME); } |