X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=2e8ca70766172fdb7eed7f663ad52b3517314160;hb=26a2dbac6501d095937568cdb9f00083e0b02146;hp=fecbd983e048c59627593f4381365062193468a7;hpb=e9ec482049972d8b6b0c73faf452666b3cc32520;p=surf.git

diff --git a/surf.c b/surf.c
index fecbd98..2e8ca70 100644
--- a/surf.c
+++ b/surf.c
@@ -60,11 +60,12 @@ typedef struct Client {
 	WebKitWebView *view;
 	WebKitWebInspector *inspector;
 	WebKitHitTestResult *mousepos;
+	GTlsCertificateFlags tlsflags;
 	const char *title, *targeturi;
 	const char *needle;
 	gint progress;
 	struct Client *next;
-	gboolean zoomed, fullscreen, isinspecting, sslfailed;
+	gboolean zoomed, fullscreen, isinspecting;
 } Client;
 
 typedef struct {
@@ -168,7 +169,7 @@ static void menuactivate(GtkMenuItem *item, Client *c);
 static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
-static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
+static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
 static void linkopen(Client *c, const Arg *arg);
 static void linkopenembed(Client *c, const Arg *arg);
 static void reload(Client *c, const Arg *arg);
@@ -896,6 +897,7 @@ newclient(Client *rc)
 	clients = c;
 
 	c->view = newview(c, rc ? rc->view : NULL);
+	c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 
 	return c;
 }
@@ -991,8 +993,8 @@ newview(Client *c, WebKitWebView *rv)
 	                 "load-changed",
 			 G_CALLBACK(loadchanged), c);
 	g_signal_connect(G_OBJECT(v),
-	                 "notify::progress",
-			 G_CALLBACK(progresschange), c);
+	                 "notify::estimated-load-progress",
+			 G_CALLBACK(progresschanged), c);
 	g_signal_connect(G_OBJECT(v),
 	                 "download-requested",
 			 G_CALLBACK(initdownload), c);
@@ -1218,9 +1220,10 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d)
 }
 
 void
-progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
 {
-	c->progress = webkit_web_view_get_progress(c->view) * 100;
+	c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+	    100;
 	updatetitle(c);
 }
 
@@ -1518,11 +1521,8 @@ getpagestat(Client *c)
 {
 	const char *uri = geturi(c);
 
-	if (strstr(uri, "https://") == uri)
-		pagestat[0] = c->sslfailed ? 'U' : 'T';
-	else
-		pagestat[0] = '-';
-
+	pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
+	    c->tlsflags > 0 ? 'U' : 'T';
 	pagestat[1] = '\0';
 }