surf

commit 981e52d5a755f7a30fc59595ab84f9df05a84f01
parent a7f2765da47529142d61c369f0cea6a68db4ed20
Author: Enno Boland (tox) <tox@s01.de>
Date:   Fri, 26 Mar 2010 21:44:48 +0100

typofix.
Diffstat:
M
config.mk
 | 
6
+++---
M
surf.c
 | 
4
++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config.mk b/config.mk
@@ -7,8 +7,8 @@ VERSION = 0.4
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
-GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0)
-GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0)
+GTKINC=$(shell pkg-config --static --cflags gtk+-2.0 webkit-1.0)
+GTKLIB=$(shell pkg-config --static --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}
+LDFLAGS = -g ${LIBS} -static
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/surf.c b/surf.c
@@ -613,7 +613,7 @@ newwindow(Client *c, const Arg *arg) {
 	if(!plugin)
 		cmd[i++] = "-p";
 	if(!loadimage)
-		cmd[i++] = "-l";
+		cmd[i++] = "-i";
 	if(showxid)
 		cmd[i++] = "-x";
 	cmd[i++] = "--";
@@ -707,7 +707,7 @@ setcookie(SoupCookie *c) {
 	SoupDate *e;
 	SoupCookieJar *j = soup_cookie_jar_text_new(cookiefile, FALSE);
 	c = soup_cookie_copy(c);
-	if(c && c->expires == NULL) {
+	if(c->expires == NULL) {
 		e = soup_date_new_from_time_t(time(NULL) + sessiontime);
 		soup_cookie_set_expires(c, e);
 	}