about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2011-08-04 18:05:27 +0000
committerMarco Peereboom <marco@conformal.com>2011-08-04 18:05:27 +0000
commit4b041b4cc745d0f9bbfcbc90ab0d39fe5a5621cb (patch)
tree1f5ae1b62114d3117d57c15419aaf44906170305
parentc9019bd82bba6073c0c18ea8373ee32009fbf1a9 (diff)
downloadxombrero-4b041b4cc745d0f9bbfcbc90ab0d39fe5a5621cb.tar.gz
when a cert is saved always blue the address bar.
-rw-r--r--xxxterm.17
-rw-r--r--xxxterm.c8
2 files changed, 11 insertions, 4 deletions
diff --git a/xxxterm.1 b/xxxterm.1
index abd86fd..0413325 100644
--- a/xxxterm.1
+++ b/xxxterm.1
@@ -978,12 +978,13 @@ running
 .Nm
 session.
 .It Cm spell_check_languages
-The languages to be used for spell checking, separated by commas. For example, en_US.
+The languages to be used for spell checking, separated by commas. For example,
+en_US.
 .It Cm ssl_ca_file
 If set to a valid PEM file
 all server certificates will be validated against it.
-The URL bar will be colored green when the certificate is trusted
-and yellow when untrusted.
+The URL bar will be colored green (or blue when saved ) when the certificate is
+trusted and yellow when untrusted.
 .Pp
 If
 .Cm ssl_ca_file
diff --git a/xxxterm.c b/xxxterm.c
index 7ef7641..38f37e4 100644
--- a/xxxterm.c
+++ b/xxxterm.c
@@ -5860,6 +5860,11 @@ show_ca_status(struct tab *t, const char *uri)
 	if (message && (soup_message_get_flags(message) &
 	    SOUP_MESSAGE_CERTIFICATE_TRUSTED)) {
 		col_str = XT_COLOR_GREEN;
+
+		/* see if we need to override green */
+		r = load_compare_cert(t, NULL);
+		if (r == 0)
+			col_str = XT_COLOR_BLUE;
 		goto done;
 	} else {
 		r = load_compare_cert(t, NULL);
@@ -6209,13 +6214,14 @@ notify_load_status_cb(WebKitWebView* wview, GParamSpec* pspec, struct tab *t)
 		if (t->styled)
 			apply_style(t);
 
-		show_ca_status(t, uri);
 
 		/* we know enough to autosave the session */
 		if (session_autosave) {
 			a.s = NULL;
 			save_tabs(t, &a);
 		}
+
+		show_ca_status(t, uri);
 		break;
 
 	case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT: