Apply domain parameters each time url is changed

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 1c194a3..9387859 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -1084,8 +1084,7 @@ showview(WebKitWebView *v, Client *c)
        GdkWindow *gwin;
 
        c->finder = webkit_web_view_get_find_controller(c->view);
-       if (curconfig[Inspector].val.b)
-               c->inspector = webkit_web_view_get_inspector(c->view);
+       c->inspector = webkit_web_view_get_inspector(c->view);
 
        c->win = createwindow(c);
 
@@ -1168,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
@@ -1462,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;
@@ -1535,12 +1531,10 @@ togglecookiepolicy(Client *c, const Arg *a)
 void
 toggleinspector(Client *c, const Arg *a)
 {
-       if (curconfig[Inspector].val.b) {
-               if (webkit_web_inspector_is_attached(c->inspector))
-                       webkit_web_inspector_close(c->inspector);
-               else
-                       webkit_web_inspector_show(c->inspector);
-       }
+       if (webkit_web_inspector_is_attached(c->inspector))
+               webkit_web_inspector_close(c->inspector);
+       else if (curconfig[Inspector].val.b)
+               webkit_web_inspector_show(c->inspector);
 }
 
 void