[evolution/gnome-3-20] Bug 767542 - Correct encrypted-only message formatter color and icon

[Milan Crha <mcrha src gnome org>]

commit c8154e7f3930896bc3607829a5503b64ecff178e
Author: Milan Crha <mcrha redhat com>
Date:   Mon Jun 13 17:24:57 2016 +0200

    Bug 767542 - Correct encrypted-only message formatter color and icon

 em-format/e-mail-formatter-secure-button.c |    8 ++++----
 em-format/e-mail-part-utils.c              |    5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index 0ed0ef4..f364af6 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -59,10 +59,10 @@ static const struct {
 static const struct {
        const gchar *icon, *shortdesc, *description;
 } smime_encrypt_table[4] = {
-       { "stock_lock-broken", N_("Unencrypted"), N_("This message is not encrypted. Its content may be 
viewed in transit across the Internet.") },
-       { "stock_lock-ok", N_("Encrypted, weak"), N_("This message is encrypted, but with a weak encryption 
algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a 
practical amount of time.") },
-       { "stock_lock-ok", N_("Encrypted"), N_("This message is encrypted.  It would be difficult for an 
outsider to view the content of this message.") },
-       { "stock_lock-ok", N_("Encrypted, strong"), N_("This message is encrypted, with a strong encryption 
algorithm. It would be very difficult for an outsider to view the content of this message in a practical 
amount of time.") },
+       { "security-low", N_("Unencrypted"), N_("This message is not encrypted. Its content may be viewed in 
transit across the Internet.") },
+       { "security-high", N_("Encrypted, weak"), N_("This message is encrypted, but with a weak encryption 
algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a 
practical amount of time.") },
+       { "security-high", N_("Encrypted"), N_("This message is encrypted.  It would be difficult for an 
outsider to view the content of this message.") },
+       { "security-high", N_("Encrypted, strong"), N_("This message is encrypted, with a strong encryption 
algorithm. It would be very difficult for an outsider to view the content of this message in a practical 
amount of time.") },
 };
 
 static const GdkRGBA smime_sign_colour[6] = {
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index afc28f4..4a6ef40 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -80,12 +80,15 @@ e_mail_part_get_frame_security_style (EMailPart *part)
                        } else if (frame_style == NULL &&
                                pair->validity->sign.status == CAMEL_CIPHER_VALIDITY_SIGN_NEED_PUBLIC_KEY) {
                                frame_style = "-e-mail-formatter-frame-security-need-key";
+                       } else if (frame_style == NULL &&
+                               pair->validity->sign.status == CAMEL_CIPHER_VALIDITY_SIGN_GOOD) {
+                               frame_style = "-e-mail-formatter-frame-security-good";
                        }
                }
        }
 
        if (frame_style == NULL)
-               frame_style = "-e-mail-formatter-frame-security-good";
+               frame_style = "-e-mail-formatter-frame-security-none";
 
        return frame_style;
 }