X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=surf.c;h=49c7c34a5b87b3e88791721b46a38f241d7d1696;hb=75cc43047fc21ddcacd564766bb3211d9d0746e6;hp=3a2e820cd531cb8c30e2bfff21eeb4dfe39462c8;hpb=e9ee0940b7552f087dc3377f160f5c0800045a36;p=surf.git

diff --git a/surf.c b/surf.c
index 3a2e820..49c7c34 100644
--- a/surf.c
+++ b/surf.c
@@ -73,6 +73,7 @@ static char *progname;
 
 static const char *autouri(Client *c);
 static char *buildpath(const char *path);
+static void changecookie(SoupCookieJar *jar, SoupCookie *o, SoupCookie *n, gpointer p);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
 static void context(WebKitWebView *v, GtkMenu *m, Client *c);
@@ -155,6 +156,18 @@ buildpath(const char *path) {
 	return apath;
 }
 
+void
+changecookie(SoupCookieJar *jar, SoupCookie *oc, SoupCookie *c, gpointer p) {
+	SoupDate *e;
+
+	if(c && c->expires == NULL) {
+		e = soup_date_new_from_time_t(time(NULL) + sessiontime);
+		c = soup_cookie_copy(c);
+		soup_cookie_set_expires(c, e);
+		soup_cookie_jar_add_cookie(cookiejar, c);
+	}
+}
+
 void
 cleanup(void) {
 	while(clients)
@@ -463,7 +476,6 @@ newclient(void) {
 				G_CALLBACK(itemclick), c);
 	}
 
-
 	/* VBox */
 	c->vbox = gtk_vbox_new(FALSE, 0);
 
@@ -630,22 +642,8 @@ reload(Client *c, const Arg *arg) {
 
 void
 reloadcookie(void) {
-	GSList *p, *l;
-	SoupCookie *c;
 	SoupSession *s;
-	SoupDate *e;
 
-	e = soup_date_new_from_time_t(time(NULL) + sessiontime);
-	for(l = p = soup_cookie_jar_all_cookies(cookiejar); p; p = p->next) {
-		c = (SoupCookie *)l->data;
-		if(c->expires == NULL) {
-			soup_cookie_set_expires(c, e);
-			soup_cookie_jar_add_cookie(cookiejar,
-					soup_cookie_copy(c));
-		}
-	}
-	soup_cookies_free(l);
-	soup_date_free(e);
 	/* This forces the cookie to be written to hdd */
 	s = webkit_get_default_session();
 	soup_session_remove_feature(s, SOUP_SESSION_FEATURE(cookiejar));
@@ -696,6 +694,7 @@ setup(void) {
 	s = webkit_get_default_session();
 	cookiejar = soup_cookie_jar_text_new(cookiefile, FALSE);
 	soup_session_add_feature(s, SOUP_SESSION_FEATURE(cookiejar));
+	g_signal_connect(cookiejar, "changed", G_CALLBACK(changecookie), NULL);
 }
 
 void
@@ -751,7 +750,7 @@ spawn(Client *c, const Arg *arg) {
 			close(ConnectionNumber(dpy));
 		setsid();
 		execvp(((char **)arg->v)[0], (char **)arg->v);
-		fprintf(stderr, "tabbed: execvp %s", ((char **)arg->v)[0]);
+		fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
 		perror(" failed");
 		exit(0);
 	}