From 1cbeab188d8769ae67dfa99a4191088ab42db415 Mon Sep 17 00:00:00 2001
From: "Enno Boland (tox)" <tox@s01.de>
Date: Mon, 8 Mar 2010 10:06:32 +0100
Subject: [PATCH] fixing progress, beginning new cookie implementation

---
 config.mk |  2 +-
 surf.c    | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/config.mk b/config.mk
index b396b82..a5f0b6d 100644
--- a/config.mk
+++ b/config.mk
@@ -18,7 +18,7 @@ LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+LDFLAGS = -g ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/surf.c b/surf.c
index 197de44..fe63fd4 100644
--- a/surf.c
+++ b/surf.c
@@ -90,6 +90,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 +504,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 +553,15 @@ 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");
+}
+
 void
 newwindow(Client *c, const Arg *arg) {
 	guint i = 0;
@@ -614,7 +625,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);
 }