[hackers] [surf] merge || Enno Boland (tox)

changeset: 202:b8cdf0bde38a
tag: tip
parent: 201:f844afd7a2b6
parent: 200:d9957625b700
user: Enno Boland (tox) <tox_AT_s01.de>
date: Tue May 11 14:57:44 2010 +0200
files: surf.c
description:
merge

diff -r f844afd7a2b6 -r b8cdf0bde38a config.def.h
--- a/config.def.h Tue May 11 14:57:09 2010 +0200
+++ b/config.def.h Tue May 11 14:57:44 2010 +0200
@@ -7,7 +7,7 @@
 static char *cookiefile = ".surf/cookies.txt";
 static char *dldir = ".surf/dl/";
 static time_t sessiontime = 0;
-#define NOBACKGROUND 1
+#define NOBACKGROUND 0
 
 #define SETPROP(p) { .v = (char *[]){ "/bin/sh", "-c", \
         "prop=\"`xprop -id $1 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
diff -r f844afd7a2b6 -r b8cdf0bde38a surf.c
--- a/surf.c Tue May 11 14:57:09 2010 +0200
+++ b/surf.c Tue May 11 14:57:44 2010 +0200
@@ -579,7 +579,7 @@
         g_free(uri);
         setatom(c, findprop, "");
         setatom(c, uriprop, "");
- if(!NOBACKGROUND)
+ if(NOBACKGROUND)
                 webkit_web_view_set_transparent(c->view, TRUE);
 
         c->download = NULL;
Received on Tue May 11 2010 - 12:56:55 UTC