about summary refs log tree commit diff
diff options
context:
space:
mode:
authorQuentin Rameau <[email protected]>2016-03-03 16:51:24 +0100
committerQuentin Rameau <[email protected]>2016-07-05 13:01:56 +0200
commit7ca9421a69956c27b010cc9fc6162df7fa9699cf (patch)
treeef48b6043041c44212776ecb32f11e7f13982d2a
parentFix inspector toggling (diff)
downloadsurf-7ca9421a69956c27b010cc9fc6162df7fa9699cf.tar.gz
surf-7ca9421a69956c27b010cc9fc6162df7fa9699cf.tar.bz2
surf-7ca9421a69956c27b010cc9fc6162df7fa9699cf.zip
Apply domain parameters each time url is changed
Urls are only changed at load (initial requested one), or while
redirected. When the page is committed, url is already final.
-rw-r--r--surf.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/surf.c b/surf.c
index acb3efe..9387859 100644
--- a/surf.c
+++ b/surf.c
@@ -1167,20 +1167,18 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 		setatom(c, AtomUri, title);
 		c->title = title;
 		c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
+		seturiparameters(c, geturi(c));
 		break;
 	case WEBKIT_LOAD_REDIRECTED:
 		setatom(c, AtomUri, title);
 		c->title = title;
+		seturiparameters(c, geturi(c));
 		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));
-		seturiparameters(c, geturi(c));
 		break;
 	case WEBKIT_LOAD_FINISHED:
 		/* Disabled until we write some WebKitWebExtension for
@@ -1461,7 +1459,6 @@ scroll(Client *c, const Arg *a)
 	GdkEvent *ev = gdk_event_new(GDK_KEY_PRESS);
 
 	gdk_event_set_device(ev, gdkkb);
-//	gdk_event_set_screen(ev, gdk_screen_get_default());
 	ev->key.window = gtk_widget_get_window(GTK_WIDGET(c->win));
 	ev->key.state = GDK_CONTROL_MASK;
 	ev->key.time = GDK_CURRENT_TIME;