X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=7b71f0eb572a1d190b175b0ddc523b6baf589438;hb=e4869357f1c625a2b56ca1327ed8c89864341d77;hp=28d56d0a66e2ff7bbf37e44666c9d297f3696e2c;hpb=7e9a37f25fb72c7a739e8d2b0bcf753cf5266c6b;p=surf.git

diff --git a/surf.c b/surf.c
index 28d56d0..7b71f0e 100644
--- a/surf.c
+++ b/surf.c
@@ -80,6 +80,7 @@ static char winid[64];
 static gboolean usingproxy = 0;
 static char togglestat[7];
 static char pagestat[3];
+static GTlsDatabase *tlsdb;
 
 static void addaccelgroup(Client *c);
 static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
@@ -601,8 +602,8 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
 			src = webkit_web_frame_get_data_source(frame);
 			request = webkit_web_data_source_get_request(src);
 			msg = webkit_network_request_get_message(request);
-			c->sslfailed = soup_message_get_flags(msg)
-			               ^ SOUP_MESSAGE_CERTIFICATE_TRUSTED;
+			c->sslfailed = !(soup_message_get_flags(msg)
+			                & SOUP_MESSAGE_CERTIFICATE_TRUSTED);
 		}
 		setatom(c, AtomUri, uri);
 		break;
@@ -635,6 +636,8 @@ loaduri(Client *c, const Arg *arg) {
 			: g_strdup_printf("http://%s", uri);
 	}
 
+	setatom(c, AtomUri, uri);
+
 	/* prevents endless loop */
 	if(strcmp(u, geturi(c)) == 0) {
 		reload(c, &a);
@@ -819,6 +822,9 @@ newclient(void) {
 			webkit_web_view_set_zoom_level(c->view, dpi/96);
 		}
 	}
+	/* This might conflict with _zoomto96dpi_. */
+	if(zoomlevel != 1.0)
+		webkit_web_view_set_zoom_level(c->view, zoomlevel);
 
 	if(enableinspector) {
 		c->inspector = WEBKIT_WEB_INSPECTOR(
@@ -1039,6 +1045,7 @@ setup(void) {
 	char *new_proxy;
 	SoupURI *puri;
 	SoupSession *s;
+	GError *error = NULL;
 
 	/* clean up any zombies immediately */
 	sigchld(0);
@@ -1065,7 +1072,13 @@ setup(void) {
 					FALSE)));
 
 	/* ssl */
-	g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
+	tlsdb = g_tls_file_database_new(cafile, &error);
+
+	if (error) {
+		g_warning("Error loading SSL database %s: %s", cafile, error->message);
+		g_error_free(error);
+	}
+	g_object_set(G_OBJECT(s), "tls-database", tlsdb, NULL);
 	g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
 
 	/* proxy */
@@ -1280,7 +1293,8 @@ static void
 usage(void) {
 	die("usage: %s [-bBfFgGiIkKnNpPsSvx]"
 		" [-c cookiefile] [-e xid] [-r scriptfile]"
-		" [-t stylefile] [-u useragent] [uri]\n", basename(argv0));
+		" [-t stylefile] [-u useragent] [-z zoomlevel]"
+		" [uri]\n", basename(argv0));
 }
 
 static void
@@ -1382,6 +1396,9 @@ main(int argc, char *argv[]) {
 	case 'x':
 		showxid = TRUE;
 		break;
+	case 'z':
+		zoomlevel = strtof(EARGF(usage()), NULL);
+		break;
 	default:
 		usage();
 	} ARGEND;