now we've got access to cookies before they're sended. Let's start building a cookieh...

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index fe63fd4..2431a8d 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,7 +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 newrequest(SoupSession *s, SoupMessage *msg, gpointer v);
 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);
@@ -504,7 +503,6 @@ 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();
@@ -553,13 +551,10 @@ newclient(void) {
        return c;
 }
 
-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_remove(h, "Cookies");
+static void newrequest(SoupSession *s, SoupMessage *msg, gpointer v) {
+       SoupMessageHeaders *h = msg->request_headers;
+
+       soup_message_headers_remove(h, "Cookie");
 }
 
 void
@@ -675,10 +670,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);
@@ -687,16 +682,23 @@ 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);
 
-       /* create dirs and files */
+       /* dirs and files */
        cookiefile = buildpath(cookiefile);
        dldir = buildpath(dldir);
        scriptfile = buildpath(scriptfile);
        stylefile = buildpath(stylefile);
 
+       /* request handler */
+       s = webkit_get_default_session();
+       soup_session_remove_feature_by_type(s, soup_cookie_get_type());
+       soup_session_remove_feature_by_type(s, soup_cookie_jar_get_type());
+       g_signal_connect_after(G_OBJECT(s), "request-started", G_CALLBACK(newrequest), NULL);
+
+
        /* proxy */
        if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
                new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :