session gets set properly in setup()

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 197de44..cbd47a1 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -56,7 +56,6 @@ typedef struct {
 
 static Display *dpy;
 static Atom uriprop, findprop;
-static SoupSession *session;
 static Client *clients = NULL;
 static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
@@ -90,6 +89,7 @@ static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
 static Client *newclient(void);
 static void newwindow(Client *c, const Arg *arg);
+static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 static void print(Client *c, const Arg *arg);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
@@ -503,6 +503,7 @@ newclient(void) {
        g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
        g_signal_connect(G_OBJECT(c->view), "notify::load-status", G_CALLBACK(loadstatuschange), c);
        g_signal_connect(G_OBJECT(c->view), "notify::progress", G_CALLBACK(progresschange), c);
+       g_signal_connect(G_OBJECT(c->view), "resource-request-starting", G_CALLBACK(newrequest), c);
 
        /* Indicator */
        c->indicator = gtk_drawing_area_new();
@@ -551,6 +552,20 @@ newclient(void) {
        return c;
 }
 
+void func(const char *name, const char *value, void *dummy) {
+printf("%s = %s\n", name, value);
+}
+
+
+static void newrequest(WebKitWebView *v, WebKitWebFrame *f, WebKitWebResource *r, WebKitNetworkRequest *req, WebKitNetworkResponse *res, Client *c) {
+       SoupMessage *msg = webkit_network_request_get_message(req);
+       SoupMessageHeaders *h;
+       if(!msg)
+               return;
+       h = msg->request_headers;
+       soup_message_headers_foreach(h, func, NULL);
+}
+
 void
 newwindow(Client *c, const Arg *arg) {
        guint i = 0;
@@ -614,7 +629,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
 
 void
 progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
-       c->progress = webkit_web_view_get_progress(c->view);;
+       c->progress = webkit_web_view_get_progress(c->view) * 100;
        update(c);
 }
 
@@ -664,10 +679,10 @@ setatom(Client *c, Atom a, const char *v) {
 
 void
 setup(void) {
-       SoupSession *s;
        char *proxy;
        char *new_proxy;
        SoupURI *puri;
+       SoupSession *s;
 
        /* clean up any zombies immediately */
        sigchld(0);
@@ -676,7 +691,7 @@ setup(void) {
                g_thread_init(NULL);
 
        dpy = GDK_DISPLAY();
-       session = webkit_get_default_session();
+       s = webkit_get_default_session();
        uriprop = XInternAtom(dpy, "_SURF_URI", False);
        findprop = XInternAtom(dpy, "_SURF_FIND", False);
 
@@ -686,6 +701,10 @@ setup(void) {
        scriptfile = buildpath(scriptfile);
        stylefile = buildpath(stylefile);
 
+       s = webkit_get_default_session();
+
+       soup_session_remove_feature_by_type(s, soup_cookie_get_type());
+
        /* proxy */
        if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
                new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :