removed builtin unfinished cookie handling.
This commit is contained in:
		
							parent
							
								
									7ffdcd756c
								
							
						
					
					
						commit
						3657813fec
					
				
							
								
								
									
										45
									
								
								surf.c
								
								
								
								
							
							
						
						
									
										45
									
								
								surf.c
								
								
								
								
							| 
						 | 
					@ -45,14 +45,6 @@ typedef struct {
 | 
				
			||||||
	const Arg arg;
 | 
						const Arg arg;
 | 
				
			||||||
} Item;
 | 
					} Item;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct Cookie {
 | 
					 | 
				
			||||||
	char *name;
 | 
					 | 
				
			||||||
	char *value;
 | 
					 | 
				
			||||||
	char *domain;
 | 
					 | 
				
			||||||
	char *path;
 | 
					 | 
				
			||||||
	struct Cookie *next;
 | 
					 | 
				
			||||||
} Cookie;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
typedef enum {
 | 
					typedef enum {
 | 
				
			||||||
	Browser = 0x0001,
 | 
						Browser = 0x0001,
 | 
				
			||||||
	SearchBar = 0x0010,
 | 
						SearchBar = 0x0010,
 | 
				
			||||||
| 
						 | 
					@ -73,7 +65,6 @@ static Atom uriprop;
 | 
				
			||||||
static SoupCookieJar *cookiejar;
 | 
					static SoupCookieJar *cookiejar;
 | 
				
			||||||
static SoupSession *session;
 | 
					static SoupSession *session;
 | 
				
			||||||
static Client *clients = NULL;
 | 
					static Client *clients = NULL;
 | 
				
			||||||
/*static Cookie *cookies = NULL;*/
 | 
					 | 
				
			||||||
static GdkNativeWindow embed = 0;
 | 
					static GdkNativeWindow embed = 0;
 | 
				
			||||||
static gboolean showxid = FALSE;
 | 
					static gboolean showxid = FALSE;
 | 
				
			||||||
static gboolean ignore_once = FALSE;
 | 
					static gboolean ignore_once = FALSE;
 | 
				
			||||||
| 
						 | 
					@ -110,13 +101,9 @@ static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f, Client *
 | 
				
			||||||
static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 | 
					static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
 | 
				
			||||||
static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 | 
					static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event, gpointer d);
 | 
				
			||||||
static void print(Client *c, const Arg *arg);
 | 
					static void print(Client *c, const Arg *arg);
 | 
				
			||||||
static void proccookies(SoupMessage *m, Client *c);
 | 
					 | 
				
			||||||
static void progresschange(WebKitWebView *v, gint p, Client *c);
 | 
					static void progresschange(WebKitWebView *v, gint p, Client *c);
 | 
				
			||||||
static void request(SoupSession *s, SoupMessage *m, Client *c);
 | 
					 | 
				
			||||||
static void reload(Client *c, const Arg *arg);
 | 
					static void reload(Client *c, const Arg *arg);
 | 
				
			||||||
static void rereadcookies(void);
 | 
					 | 
				
			||||||
static void sigchld(int unused);
 | 
					static void sigchld(int unused);
 | 
				
			||||||
static void setcookie(char *name, char *val, char *dom, char *path, long exp);
 | 
					 | 
				
			||||||
static void setup(void);
 | 
					static void setup(void);
 | 
				
			||||||
static void spawn(Client *c, const Arg *arg);
 | 
					static void spawn(Client *c, const Arg *arg);
 | 
				
			||||||
static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
 | 
					static void titlechange(WebKitWebView *v, WebKitWebFrame* frame, const char* title, Client *c);
 | 
				
			||||||
| 
						 | 
					@ -488,7 +475,6 @@ newclient(void) {
 | 
				
			||||||
	g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
 | 
						g_signal_connect(G_OBJECT(c->view), "new-window-policy-decision-requested", G_CALLBACK(decidewindow), c);
 | 
				
			||||||
	g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
 | 
						g_signal_connect(G_OBJECT(c->view), "download-requested", G_CALLBACK(initdownload), c);
 | 
				
			||||||
	g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
 | 
						g_signal_connect(G_OBJECT(c->view), "window-object-cleared", G_CALLBACK(windowobjectcleared), c);
 | 
				
			||||||
	g_signal_connect_after(session, "request-started", G_CALLBACK(request), c);
 | 
					 | 
				
			||||||
	g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
 | 
						g_signal_connect(G_OBJECT(c->view), "focus-in-event", G_CALLBACK(focusview), c);
 | 
				
			||||||
	g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 | 
						g_signal_connect(G_OBJECT(c->view), "populate-popup", G_CALLBACK(context), c);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -618,33 +604,12 @@ print(Client *c, const Arg *arg) {
 | 
				
			||||||
	webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
 | 
						webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					 | 
				
			||||||
proccookies(SoupMessage *m, Client *c) {
 | 
					 | 
				
			||||||
	GSList *l;
 | 
					 | 
				
			||||||
	SoupCookie *co;
 | 
					 | 
				
			||||||
	long t;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	rereadcookies();
 | 
					 | 
				
			||||||
	for (l = soup_cookies_from_response(m); l; l = l->next){
 | 
					 | 
				
			||||||
		co = (SoupCookie *)l->data;
 | 
					 | 
				
			||||||
		t = co->expires ?  soup_date_to_time_t(co->expires) : 0;
 | 
					 | 
				
			||||||
		setcookie(co->name, co->value, co->domain, co->value, t);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	g_slist_free(l);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
progresschange(WebKitWebView *v, gint p, Client *c) {
 | 
					progresschange(WebKitWebView *v, gint p, Client *c) {
 | 
				
			||||||
	c->progress = p;
 | 
						c->progress = p;
 | 
				
			||||||
	update(c);
 | 
						update(c);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					 | 
				
			||||||
request(SoupSession *s, SoupMessage *m, Client *c) {
 | 
					 | 
				
			||||||
	soup_message_add_header_handler(m, "got-headers", "Set-Cookie",
 | 
					 | 
				
			||||||
			G_CALLBACK(proccookies), c);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
reload(Client *c, const Arg *arg) {
 | 
					reload(Client *c, const Arg *arg) {
 | 
				
			||||||
	gboolean nocache = *(gboolean *)arg;
 | 
						gboolean nocache = *(gboolean *)arg;
 | 
				
			||||||
| 
						 | 
					@ -654,11 +619,6 @@ reload(Client *c, const Arg *arg) {
 | 
				
			||||||
		 webkit_web_view_reload(c->view);
 | 
							 webkit_web_view_reload(c->view);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					 | 
				
			||||||
rereadcookies(void) {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
scroll(Client *c, const Arg *arg) {
 | 
					scroll(Client *c, const Arg *arg) {
 | 
				
			||||||
	gdouble v;
 | 
						gdouble v;
 | 
				
			||||||
| 
						 | 
					@ -679,11 +639,6 @@ sigchld(int unused) {
 | 
				
			||||||
	while(0 < waitpid(-1, NULL, WNOHANG));
 | 
						while(0 < waitpid(-1, NULL, WNOHANG));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					 | 
				
			||||||
setcookie(char *name, char *val, char *dom, char *path, long exp) {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
setup(void) {
 | 
					setup(void) {
 | 
				
			||||||
	SoupSession *s;
 | 
						SoupSession *s;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue