diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-07-09 10:50:39 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-07-09 10:50:39 +0800 |
| commit | 0006ecd24503b6c2f7e0ea3941c86ca841cc9263 (patch) | |
| tree | aae61c5a11a0dab91cb3ef48c5b1ab4f9ef0fab6 /mail | |
| parent | a11e7afc54918cc11c8dc476f52d8380351808bc (diff) | |
| download | gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.tar gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.tar.gz gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.tar.bz2 gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.tar.lz gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.tar.xz gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.tar.zst gsoc2013-evolution-0006ecd24503b6c2f7e0ea3941c86ca841cc9263.zip | |
** Fix for bug #347782 from hggdh
svn path=/trunk/; revision=33773
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-format.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f1c7ced0d7..dd9a13296b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-07-09 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #347782 from hggdh + + * em-format.c: (emf_multipart_encrypted), + (emf_inlinepgp_encrypted): + 2007-07-08 Johnny Jacob <jjohnny@novell.com> * em-composer-utils.c : Added composer.presendcheck event. Fixes diff --git a/mail/em-format.c b/mail/em-format.c index 2260cf4e74..2dc626bb85 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -1307,7 +1307,7 @@ emf_multipart_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *part, opart = camel_mime_part_new(); valid = camel_cipher_decrypt(context, part, opart, ex); if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error")); + em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); if (ex->desc) em_format_format_error(emf, stream, ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); @@ -1609,7 +1609,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart /* Decrypt the message */ valid = camel_cipher_decrypt (cipher, ipart, opart, ex); if (!valid) { - em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error")); + em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); if (ex->desc) em_format_format_error(emf, stream, ex->desc); em_format_format_source(emf, stream, ipart); |