From 9d50324c79ebe4fa18b71bf2d178278c65acb907 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 11 Oct 2013 10:04:57 +0200 Subject: Signature/encryption bar may not inherit text color from theme The "signature bar" overrides background color, thus it should override also text color, to make sure the text will be always readable. This could break with dark theme, which uses light text color. --- em-format/e-mail-formatter-secure-button.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c index 91a330348f..bdda034d5b 100644 --- a/em-format/e-mail-formatter-secure-button.c +++ b/em-format/e-mail-formatter-secure-button.c @@ -66,8 +66,13 @@ static const struct { { "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.") }, }; -static const GdkRGBA smime_sign_colour[5] = { - { 0 }, { 0.53, 0.73, 0.53, 1 }, { 0.73, 0.53, 0.53, 1 }, { 0.91, 0.82, 0.13, 1 }, { 0 }, +static const GdkRGBA smime_sign_colour[6] = { + { 0.0, 0.0, 0.0, 0.0 }, + { 0.53, 0.73, 0.53, 1.0 }, + { 0.73, 0.53, 0.53, 1.0 }, + { 0.91, 0.82, 0.13, 1.0 }, + { 0.0, 0.0, 0.0, 0.0 }, + { 0.0, 0.0, 0.0, 1.0 } }; static gboolean @@ -416,6 +421,8 @@ secure_button_get_widget_for_validity (CamelCipherValidity *validity) gtk_button_set_image (GTK_BUTTON (button), widget); widget = gtk_label_new (description); + /* make sure the text color doesn't change with theme */ + gtk_widget_override_color (widget, GTK_STATE_FLAG_NORMAL, &smime_sign_colour[5]); gtk_box_pack_start (GTK_BOX (layout), widget, FALSE, FALSE, 0); g_free (description); -- cgit v1.2.3