surf

commit 934705c420a25054b9be55a5321e97d6d56579e2
parent ee04671220690ec225112d49ece959239a3e2202
Author: Quentin Rameau <[email protected]>
Date:   Tue,  1 Dec 2015 12:31:42 +0100

Fix title handling

Don't forget to always set the title to the current uri, this way it's
up to date when there is no title on the page (ie for local file
exploration).
Thanks to pickfire for reporting the issue.

Diffstat:
M
surf.c
 | 
12
++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/surf.c b/surf.c
@@ -365,7 +365,6 @@ loaduri(Client *c, const Arg *a)
 		reload(c, a);
 	} else {
 		webkit_web_view_load_uri(c->view, url);
-		c->title = geturi(c);
 		updatetitle(c);
 	}
 
@@ -964,20 +963,25 @@ createwindow(Client *c)
 void
 loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 {
+	const char *title = geturi(c);
+
 	switch (e) {
 	case WEBKIT_LOAD_STARTED:
+		setatom(c, AtomUri, title);
+		c->title = title;
 		c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 		break;
 	case WEBKIT_LOAD_REDIRECTED:
-		setatom(c, AtomUri, geturi(c));
+		setatom(c, AtomUri, title);
+		c->title = title;
 		break;
 	case WEBKIT_LOAD_COMMITTED:
+		setatom(c, AtomUri, title);
+		c->title = title;
 		if (!webkit_web_view_get_tls_info(c->view, NULL,
 		    &(c->tlsflags)))
 			c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
 
-		setatom(c, AtomUri, geturi(c));
-
 		if (enablestyle)
 			setstyle(c, getstyle(geturi(c)));
 		break;