X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=37d457ea1b6a94e8ca73cb48040a25b171278420;hb=8eb2392442450127a834ed01de05f9f5c3bcad9e;hp=0d05732ef90fb429d27276112e9abb716e68ca39;hpb=3657813fec9b1b81ecb7de9389eaade702112005;p=surf.git

diff --git a/surf.c b/surf.c
index 0d05732..37d457e 100644
--- a/surf.c
+++ b/surf.c
@@ -92,6 +92,7 @@ static void itemclick(GtkMenuItem *mi, Client *c);
 static gboolean keypress(GtkWidget *w, GdkEventKey *ev, Client *c);
 static void linkhover(WebKitWebView *v, const char* t, const char* l, Client *c);
 static void loadcommit(WebKitWebView *v, WebKitWebFrame *f, Client *c);
+static void loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loadstart(WebKitWebView *v, WebKitWebFrame *f, Client *c);
 static void loaduri(Client *c, const Arg *arg);
 static void navigate(Client *c, const Arg *arg);
@@ -103,10 +104,10 @@ static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 static void print(Client *c, const Arg *arg);
 static void progresschange(WebKitWebView *v, gint p, Client *c);
 static void reload(Client *c, const Arg *arg);
+static void reloadcookie();
 static void sigchld(int unused);
 static void setup(void);
 static void spawn(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
 static void scroll(Client *c, const Arg *arg);
 static void searchtext(Client *c, const Arg *arg);
 static void source(Client *c, const Arg *arg);
@@ -186,8 +187,6 @@ context(WebKitWebView *v, GtkMenu *m, Client *c) {
 		if(parent)
 			gtk_container_remove(parent, c->items[i]);
 		gtk_menu_shell_append(GTK_MENU_SHELL(m), c->items[i]);
-		g_signal_connect(G_OBJECT(c->items[i]), "activate",
-				G_CALLBACK(itemclick), c);
 		gtk_widget_show(c->items[i]);
 	}
 }
@@ -397,8 +396,14 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
 			strlen(uri) + 1);
 }
 
+void
+loadfinished(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
+	reloadcookie();
+}
+
 void
 loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
+	reloadcookie();
 	c->progress = 0;
 	update(c);
 }
@@ -452,8 +457,11 @@ newclient(void) {
 		die("Cannot malloc!\n");
 
 	/* contextmenu */
-	for(i = 0; i < LENGTH(items); i++)
+	for(i = 0; i < LENGTH(items); i++) {
 		c->items[i] = gtk_menu_item_new_with_label(items[i].label);
+		g_signal_connect(G_OBJECT(c->items[i]), "activate",
+				G_CALLBACK(itemclick), c);
+	}
 
 
 	/* VBox */
@@ -468,6 +476,7 @@ newclient(void) {
 	c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 	g_signal_connect(G_OBJECT(c->view), "title-changed", G_CALLBACK(titlechange), c);
 	g_signal_connect(G_OBJECT(c->view), "load-progress-changed", G_CALLBACK(progresschange), c);
+	g_signal_connect(G_OBJECT(c->view), "load-finished", G_CALLBACK(loadfinished), c);
 	g_signal_connect(G_OBJECT(c->view), "load-committed", G_CALLBACK(loadcommit), c);
 	g_signal_connect(G_OBJECT(c->view), "load-started", G_CALLBACK(loadstart), c);
 	g_signal_connect(G_OBJECT(c->view), "hovering-over-link", G_CALLBACK(linkhover), c);
@@ -619,6 +628,16 @@ reload(Client *c, const Arg *arg) {
 		 webkit_web_view_reload(c->view);
 }
 
+void
+reloadcookie(void) {
+	SoupSession *s;
+
+	/* This forces the cookie to be written to hdd */
+	s = webkit_get_default_session();
+	soup_session_remove_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+} 
+
 void
 scroll(Client *c, const Arg *arg) {
 	gdouble v;