aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-08-27 13:25:47 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-08-27 13:25:47 +0800
commit8683d227456da4b93de9bcffd873d54c73ebf3db (patch)
tree208da9e4624f67a720198960aa6834f350601e45
parenteda9be1e893bd521c696c612093577c88a40b162 (diff)
downloadgsoc2013-evolution-8683d227456da4b93de9bcffd873d54c73ebf3db.tar.gz
gsoc2013-evolution-8683d227456da4b93de9bcffd873d54c73ebf3db.tar.zst
gsoc2013-evolution-8683d227456da4b93de9bcffd873d54c73ebf3db.zip
** Fix for bug #256878 from Vincent Untz
svn path=/trunk/; revision=34110
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-format-html-display.c6
-rw-r--r--mail/em-format-html.c7
3 files changed, 15 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 08d3d42fb5..803b3a6c4a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-27 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #256878 from Vincent Untz
+
+ * em-format-html-display.c: Set the string for valid signatures.
+ * em-format-html.c:
+
2007-08-24 Milan Crha <mcrha@redhat.com>
** Fix for bug #414420 by Ed Catmur
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 6287c41252..13b9e0d64f 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -934,11 +934,13 @@ efhd_complete(EMFormat *emf)
/* FIXME: also in em-format-html.c */
static const struct {
const char *icon, *shortdesc, *description;
-} smime_sign_table[4] = {
+} smime_sign_table[5] = {
{ "stock_signature-bad", N_("Unsigned"), N_("This message is not signed. There is no guarantee that this message is authentic.") },
{ "stock_signature-ok", N_("Valid signature"), N_("This message is signed and is valid meaning that it is very likely that this message is authentic.") },
{ "stock_signature-bad", N_("Invalid signature"), N_("The signature of this message cannot be verified, it may have been altered in transit.") },
- { "stock_signature", N_("Valid signature, cannot verify sender"), N_("This message is signed with a valid signature, but the sender of the message cannot be verified.") },
+ { "stock_signature", N_("Valid signature, but cannot verify sender"), N_("This message is signed with a valid signature, but the sender of the message cannot be verified.") },
+ { "stock_signature-bad", N_("Signature exists, but need public key"), N_("This message is signed with a signature, but there is no corresponding public key.") },
+
};
static const struct {
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 1ed80a63c6..c00ab3a496 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*
- */
+ */Signature exists, but need public key
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -628,11 +628,12 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh)
/* FIXME: This is duplicated in em-format-html-display, should be exported or in security module */
static const struct {
const char *icon, *shortdesc;
-} smime_sign_table[4] = {
+} smime_sign_table[5] = {
{ "stock_signature-bad", N_("Unsigned") },
{ "stock_signature-ok", N_("Valid signature") },
{ "stock_signature-bad", N_("Invalid signature") },
- { "stock_signature", N_("Valid signature but cannot verify sender") },
+ { "stock_signature", N_("Valid signature, but cannot verify sender") },
+ { "stock_signature-bad", N_("Signature exists, but need public key") },
};
static const struct {