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,
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;
: g_strdup_printf("http://%s", uri);
}
+ setatom(c, AtomUri, uri);
+
/* prevents endless loop */
if(strcmp(u, geturi(c)) == 0) {
reload(c, &a);
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(
char *new_proxy;
SoupURI *puri;
SoupSession *s;
+ GError *error = NULL;
/* clean up any zombies immediately */
sigchld(0);
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 */
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
case 'x':
showxid = TRUE;
break;
+ case 'z':
+ zoomlevel = strtof(EARGF(usage()), NULL);
+ break;
default:
usage();
} ARGEND;