From 8aabfa5b4591b020173441a7a6df631ba3ecae3f Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Mon, 29 Mar 2010 17:49:34 +0200 Subject: [PATCH 1/4] whoops... linking Oo --- config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index ff7f604..a5f0b6d 100644 --- a/config.mk +++ b/config.mk @@ -7,8 +7,8 @@ VERSION = 0.4 PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man -GTKINC=$(shell pkg-config --static --cflags gtk+-2.0 webkit-1.0) -GTKLIB=$(shell pkg-config --static --libs gtk+-2.0 webkit-1.0) +GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) +GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) # includes and libs @@ -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 = -g ${LIBS} -static +LDFLAGS = -g ${LIBS} # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" From 4b1b1b8a2070793e7f6467f2005d6fbd1ae63065 Mon Sep 17 00:00:00 2001 From: pancake Date: Thu, 8 Apr 2010 20:28:32 +0200 Subject: [PATCH 2/4] remove empty lines --- surf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/surf.c b/surf.c index cac31d6..b96ecf3 100644 --- a/surf.c +++ b/surf.c @@ -589,9 +589,8 @@ newrequest(SoupSession *s, SoupMessage *msg, gpointer v) { soup_message_headers_remove(h, "Cookie"); uri = soup_message_get_uri(msg); - if((c = getcookies(uri))) { + if((c = getcookies(uri))) soup_message_headers_append(h, "Cookie", c); - } g_signal_connect_after(G_OBJECT(msg), "got-headers", G_CALLBACK(gotheaders), NULL); } @@ -754,7 +753,6 @@ setup(void) { 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) : From e9c9715f52afd3b4e3d512aea9d021e7e1980f63 Mon Sep 17 00:00:00 2001 From: "Enno Boland (tox)" Date: Sun, 2 May 2010 10:59:28 +0200 Subject: [PATCH 3/4] Adding small fix by Alex Puterbaugh. Thanks. --- config.mk | 2 +- surf.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config.mk b/config.mk index a5f0b6d..c40df0b 100644 --- a/config.mk +++ b/config.mk @@ -17,7 +17,7 @@ LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0 # flags CPPFLAGS = -DVERSION=\"${VERSION}\" -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} +CFLAGS = -std=c99 -pedantic -Wall -O0 -g ${INCS} ${CPPFLAGS} LDFLAGS = -g ${LIBS} # Solaris diff --git a/surf.c b/surf.c index b96ecf3..448c762 100644 --- a/surf.c +++ b/surf.c @@ -254,7 +254,7 @@ void download(Client *c, const Arg *arg) { char *uri; WebKitNetworkRequest *r; - WebKitDownload *dl; + WebKitDownload *dl; if(arg->v) uri = (char *)arg->v; @@ -420,18 +420,17 @@ linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) { void loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) { - if(c->download) - stop(c, NULL); switch(webkit_web_view_get_load_status (c->view)) { case WEBKIT_LOAD_COMMITTED: - setatom(c, uriprop, geturi(c)); + if(c->download) + stop(c, NULL); + setatom(c, uriprop, geturi(c)); break; case WEBKIT_LOAD_FINISHED: c->progress = 0; update(c); break; - case WEBKIT_LOAD_PROVISIONAL: - case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT: + default: break; } } From 11039e5e2b8cef231f49bef1175c4d4d94ee6ba3 Mon Sep 17 00:00:00 2001 From: pancake Date: Sat, 8 May 2010 21:43:53 +0200 Subject: [PATCH 4/4] Do not set cookie session time if set to 0 Add NOBACKGROUND config.def.h option - requires body {background-color} in style.css - fixes white background when loading pages --- config.def.h | 3 ++- surf.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h index 6c143ae..1110acc 100644 --- a/config.def.h +++ b/config.def.h @@ -6,7 +6,8 @@ static char *stylefile = ".surf/style.css"; static char *scriptfile = ".surf/script.js"; static char *cookiefile = ".surf/cookies.txt"; static char *dldir = ".surf/dl/"; -static time_t sessiontime = 3600; +static time_t sessiontime = 0; +#define NOBACKGROUND 0 #define SETPROP(p) { .v = (char *[]){ "/bin/sh", "-c", \ "prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \ diff --git a/surf.c b/surf.c index 448c762..652889b 100644 --- a/surf.c +++ b/surf.c @@ -567,6 +567,8 @@ newclient(void) { g_free(uri); setatom(c, findprop, ""); setatom(c, uriprop, ""); + if(!NOBACKGROUND) + webkit_web_view_set_transparent(c->view, TRUE); c->download = NULL; c->title = NULL; @@ -705,7 +707,7 @@ setcookie(SoupCookie *c) { SoupDate *e; SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE); c = soup_cookie_copy(c); - if(c->expires == NULL) { + if(c->expires == NULL && sessiontime) { e = soup_date_new_from_time_t(time(NULL) + sessiontime); soup_cookie_set_expires(c, e); }